From e37791da3253399b129acde2bb7db6a957552887 Mon Sep 17 00:00:00 2001 From: Ryan Amos Date: Tue, 12 Nov 2013 10:36:12 -0800 Subject: [PATCH 01/12] Add support for #github in javascript. Fixes #29 --- lib/bwoken/cli/test.rb | 6 +-- lib/bwoken/{coffeescript.rb => input.rb} | 28 ++++++++----- .../github_import_string.rb | 2 +- .../{coffeescript => input}/import_string.rb | 2 +- .../github_import_string_spec.rb | 6 +-- .../import_string_spec.rb | 6 +-- .../{coffeescript_spec.rb => input_spec.rb} | 39 ++++++++++++------- 7 files changed, 55 insertions(+), 34 deletions(-) rename lib/bwoken/{coffeescript.rb => input.rb} (64%) rename lib/bwoken/{coffeescript => input}/github_import_string.rb (98%) rename lib/bwoken/{coffeescript => input}/import_string.rb (89%) rename spec/lib/bwoken/{coffeescript => input}/github_import_string_spec.rb (95%) rename spec/lib/bwoken/{coffeescript => input}/import_string_spec.rb (61%) rename spec/lib/bwoken/{coffeescript_spec.rb => input_spec.rb} (61%) diff --git a/lib/bwoken/cli/test.rb b/lib/bwoken/cli/test.rb index 78f1e5e..58e80e3 100644 --- a/lib/bwoken/cli/test.rb +++ b/lib/bwoken/cli/test.rb @@ -4,12 +4,12 @@ require 'bwoken' require 'bwoken/build' -require 'bwoken/coffeescript' require 'bwoken/device' #TODO: make formatters dynamically loadable during runtime require 'bwoken/formatter' require 'bwoken/formatters/passthru_formatter' require 'bwoken/formatters/colorful_formatter' +require 'bwoken/input' require 'bwoken/script_runner' module Bwoken @@ -91,13 +91,13 @@ def transpile compiled_coffee.zip(coffeescripts).each do |target, source| containing_dir = target.pathmap('%d') ensure_directory containing_dir - Bwoken::Coffeescript.compile source, target + Bwoken::Input.process source, target end copied_javascripts.zip(javascripts).each do |target, source| containing_dir = target.pathmap('%d') ensure_directory containing_dir - FileUtils.cp source, target + Bwoken::Input.process source, target end end diff --git a/lib/bwoken/coffeescript.rb b/lib/bwoken/input.rb similarity index 64% rename from lib/bwoken/coffeescript.rb rename to lib/bwoken/input.rb index a7743a0..cc28eab 100644 --- a/lib/bwoken/coffeescript.rb +++ b/lib/bwoken/input.rb @@ -3,13 +3,17 @@ require 'json' require 'execjs' -require File.expand_path('../coffeescript/import_string', __FILE__) -require File.expand_path('../coffeescript/github_import_string', __FILE__) +require File.expand_path('../input/import_string', __FILE__) +require File.expand_path('../input/github_import_string', __FILE__) module Bwoken - class Coffeescript + class Input class << self + def coffee_script? source + source.downcase.end_with?('.coffee') + end + def coffee_script_source return @coffeescript if @coffeescript @@ -24,21 +28,25 @@ def context @context ||= ExecJS.compile(coffee_script_source) end - def precompile coffeescript - coffeescript.lines.partition {|line| line =~ /^#(?:github|import) .*$/} + def preprocess script + script.lines.partition {|line| line =~ /^#(?:github|import) .*$/} end - def compile source, target - githubs_and_imports, sans_imports = precompile(IO.read source) + def process source, target + githubs_and_imports, sans_imports = preprocess(IO.read source) - javascript = coffeescript_to_javascript sans_imports.join + javascript = compile_to_javascript(source, sans_imports.join) import_strings = githubs_to_imports(githubs_and_imports) write import_strings, javascript, :to => target end - def coffeescript_to_javascript coffee - self.context.call 'CoffeeScript.compile', coffee, :bare => true + def compile_to_javascript source, script + if coffee_script? source + self.context.call 'CoffeeScript.compile', script, :bare => true + else + script + end end def githubs_to_imports strings diff --git a/lib/bwoken/coffeescript/github_import_string.rb b/lib/bwoken/input/github_import_string.rb similarity index 98% rename from lib/bwoken/coffeescript/github_import_string.rb rename to lib/bwoken/input/github_import_string.rb index 369b4b3..034bffd 100644 --- a/lib/bwoken/coffeescript/github_import_string.rb +++ b/lib/bwoken/input/github_import_string.rb @@ -2,7 +2,7 @@ require File.expand_path('../import_string', __FILE__) module Bwoken - class Coffeescript + class Input class GithubImportString < ImportString attr_reader :repo_name, :file_path diff --git a/lib/bwoken/coffeescript/import_string.rb b/lib/bwoken/input/import_string.rb similarity index 89% rename from lib/bwoken/coffeescript/import_string.rb rename to lib/bwoken/input/import_string.rb index 2b6c48c..db994e2 100644 --- a/lib/bwoken/coffeescript/import_string.rb +++ b/lib/bwoken/input/import_string.rb @@ -1,5 +1,5 @@ module Bwoken - class Coffeescript + class Input class ImportString def initialize string diff --git a/spec/lib/bwoken/coffeescript/github_import_string_spec.rb b/spec/lib/bwoken/input/github_import_string_spec.rb similarity index 95% rename from spec/lib/bwoken/coffeescript/github_import_string_spec.rb rename to spec/lib/bwoken/input/github_import_string_spec.rb index dadcf95..cb12658 100644 --- a/spec/lib/bwoken/coffeescript/github_import_string_spec.rb +++ b/spec/lib/bwoken/input/github_import_string_spec.rb @@ -1,8 +1,8 @@ -require 'bwoken/coffeescript/github_import_string' +require 'bwoken/input/github_import_string' -describe Bwoken::Coffeescript::GithubImportString do +describe Bwoken::Input::GithubImportString do let(:string) { '#github alexvollmer/tuneup_js/tuneup.js' } - subject { Bwoken::Coffeescript::GithubImportString.new(string) } + subject { Bwoken::Input::GithubImportString.new(string) } describe '#parse' do it 'ensures the github repo is pulled' do diff --git a/spec/lib/bwoken/coffeescript/import_string_spec.rb b/spec/lib/bwoken/input/import_string_spec.rb similarity index 61% rename from spec/lib/bwoken/coffeescript/import_string_spec.rb rename to spec/lib/bwoken/input/import_string_spec.rb index 3a97026..ebb43c6 100644 --- a/spec/lib/bwoken/coffeescript/import_string_spec.rb +++ b/spec/lib/bwoken/input/import_string_spec.rb @@ -1,8 +1,8 @@ -require 'bwoken/coffeescript/import_string' +require 'bwoken/input/import_string' -describe Bwoken::Coffeescript::ImportString do +describe Bwoken::Input::ImportString do let(:string) { '#import foo.js' } - subject { Bwoken::Coffeescript::ImportString.new(string) } + subject { Bwoken::Input::ImportString.new(string) } describe '#parse' do it 'does not affect @string' do diff --git a/spec/lib/bwoken/coffeescript_spec.rb b/spec/lib/bwoken/input_spec.rb similarity index 61% rename from spec/lib/bwoken/coffeescript_spec.rb rename to spec/lib/bwoken/input_spec.rb index 3e28fd2..03b67a5 100644 --- a/spec/lib/bwoken/coffeescript_spec.rb +++ b/spec/lib/bwoken/input_spec.rb @@ -1,16 +1,16 @@ -require 'bwoken/coffeescript' +require 'bwoken/input' require 'stringio' require 'spec_helper' -describe Bwoken::Coffeescript do - let(:subject) { Bwoken::Coffeescript } +describe Bwoken::Input do + let(:subject) { Bwoken::Input } describe '.precompile' do describe '"#import"' do let(:test_coffee) {"foo = 1\n#import bazzle.js\nbar = 2"} it 'splits #import statements from other statements' do - subject.precompile(test_coffee).should == [ + subject.preprocess(test_coffee).should == [ ["#import bazzle.js\n"], ["foo = 1\n", "bar = 2"] ] @@ -20,7 +20,7 @@ describe '"#github"' do let(:test_coffee) {"#github alexvollmer/tuneup_js\n#import bazzle.js\nfoo = 1\nbar = 2"} it 'converts github to import' do - subject.precompile(test_coffee).should == [ + subject.preprocess(test_coffee).should == [ ["#github alexvollmer/tuneup_js\n", "#import bazzle.js\n"], ["foo = 1\n", "bar = 2"] ] @@ -28,23 +28,36 @@ end end - describe '.compile' do + describe '.coffee_script?' do + context 'is coffee script' do + it 'is true' do + subject.coffee_script?("foo/bar.coffee").should be_true + end + end + context 'is javascript' do + it 'is false' do + subject.coffee_script?("foo/bar.js").should be_false + end + end + end + + describe '.process' do before do - subject.stub(:precompile => [[], []]) + subject.stub(:preprocess => [[], []]) IO.stub(:read) subject.stub(:write) - subject.stub(:coffeescript_to_javascript) + subject.stub(:compile_to_javascript) subject.stub(:githubs_to_imports) end - after { subject.compile 'a', 'b' } + after { subject.process 'a', 'b' } - it 'precompiles' do - subject.should_receive(:precompile) + it 'preprocesses' do + subject.should_receive(:preprocess) end - it 'cofffeescript-compiles' do - subject.should_receive(:coffeescript_to_javascript) + it 'script-compiles' do + subject.should_receive(:compile_to_javascript) end it 'resolves github imports' do From f971cb6269cbab17dc52370925e65d2ed509fc59 Mon Sep 17 00:00:00 2001 From: Ryan Amos Date: Thu, 7 Nov 2013 14:58:09 -0800 Subject: [PATCH 02/12] Allow the ability to specify the SDK version. --- README.md | 2 ++ lib/bwoken/build.rb | 3 ++- lib/bwoken/cli.rb | 3 ++- lib/bwoken/cli/test.rb | 2 ++ spec/lib/bwoken/build_spec.rb | 3 ++- 5 files changed, 10 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 9cf3e4e..5ee3034 100644 --- a/README.md +++ b/README.md @@ -112,6 +112,8 @@ $ bwoken test -h --focus Specify particular tests to run --clobber Remove any generated file --skip-build Do not build the iOS binary + --configuration The build configruation to use (e.g., --configuration=Release) + --sdk-version The SDK version to use (e.g., --sdk=6.1) --verbose Be verbose -h, --help Display this help message. diff --git a/lib/bwoken/build.rb b/lib/bwoken/build.rb index ba93e35..8d430b8 100644 --- a/lib/bwoken/build.rb +++ b/lib/bwoken/build.rb @@ -34,6 +34,7 @@ def app_dir simulator attr_accessor :scheme attr_accessor :simulator attr_accessor :configuration + attr_accessor :sdk_version attr_accessor :verbose def initialize @@ -67,7 +68,7 @@ def cmd #{Bwoken.workspace_or_project_flag} \ #{scheme_string} \ -configuration #{configuration} \ - -sdk #{sdk} \ + -sdk #{sdk}#{sdk_version} \ -xcconfig #{self.class.xcconfig} \ #{variables_for_cli} \ clean build" diff --git a/lib/bwoken/cli.rb b/lib/bwoken/cli.rb index 98fc23f..87cf7cc 100644 --- a/lib/bwoken/cli.rb +++ b/lib/bwoken/cli.rb @@ -34,8 +34,9 @@ on :focus=, 'Specify particular tests to run', :as => Array, :default => [] on :clobber, 'Remove any generated file' on :'skip-build', 'Do not build the iOS binary' - on :verbose, 'Be verbose' on :configuration=, 'The build configruation to use (e.g., --configuration=Release)', :default => 'Debug' + on :'sdk-version=', 'The SDK version to use (e.g., --sdk=6.1)' + on :verbose, 'Be verbose' run { ran_command = 'test' } end diff --git a/lib/bwoken/cli/test.rb b/lib/bwoken/cli/test.rb index 58e80e3..0e8e788 100644 --- a/lib/bwoken/cli/test.rb +++ b/lib/bwoken/cli/test.rb @@ -50,6 +50,7 @@ def self.help_banner # :integration-path - the base directory for all the integration files # :product-name - the name of the generated .app file if it is different from the name of the project/workspace # :configuration - typically "Debug" or "Release" + # :sdk-version - the version of the sdk to use when building def initialize opts opts = opts.to_hash if opts.is_a?(Slop) self.options = opts.to_hash.tap do |o| @@ -78,6 +79,7 @@ def compile b.scheme = options[:scheme] if options[:scheme] b.simulator = options[:simulator] b.configuration = options[:configuration] + b.sdk_version = options[:'sdk-version'] end.compile end diff --git a/spec/lib/bwoken/build_spec.rb b/spec/lib/bwoken/build_spec.rb index f0fe4f0..0b8ea54 100644 --- a/spec/lib/bwoken/build_spec.rb +++ b/spec/lib/bwoken/build_spec.rb @@ -30,6 +30,7 @@ scheme_regex = scheme.gsub(/ /, '\s+') configuration = stub_out(subject, :configuration, :baz) sdk = stub_out(subject, :sdk, :qux) + sdk_version = stub_out(subject, :sdk_version, 123) xcconfig = stub_out(subject.class, :xcconfig, :quz) variables_for_cli = stub_out(subject, :variables_for_cli, :quux) @@ -38,7 +39,7 @@ #{workspace_regex}\s+ #{scheme_regex}\s+ -configuration\s+#{configuration}\s+ - -sdk\s+#{sdk}\s+ + -sdk\s+#{sdk}#{sdk_version}\s+ -xcconfig\s+#{xcconfig}\s+ #{variables_for_cli}\s+ clean\s+build From f5ca638b7d02073905985375aa28f25300cddf8f Mon Sep 17 00:00:00 2001 From: Bradley Grzesiak and Matt Gauger Date: Mon, 18 Nov 2013 19:31:21 -0600 Subject: [PATCH 03/12] Allow spaces in scheme --- lib/bwoken/build.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bwoken/build.rb b/lib/bwoken/build.rb index 8d430b8..f934e37 100644 --- a/lib/bwoken/build.rb +++ b/lib/bwoken/build.rb @@ -60,7 +60,7 @@ def variables_for_cli end def scheme_string - Bwoken.xcworkspace ? "-scheme #{scheme}" : '' + Bwoken.xcworkspace ? %Q|-scheme "#{scheme}"| : '' end def cmd From 3486620ff5bf09809091e0b6447fbe3edd901a83 Mon Sep 17 00:00:00 2001 From: Bradley Grzesiak and Matt Gauger Date: Mon, 18 Nov 2013 19:33:00 -0600 Subject: [PATCH 04/12] Bump to v2.0.0.beta.3 --- lib/bwoken/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bwoken/version.rb b/lib/bwoken/version.rb index e4f08bc..e58965b 100644 --- a/lib/bwoken/version.rb +++ b/lib/bwoken/version.rb @@ -1,3 +1,3 @@ module Bwoken - VERSION = "2.0.0.beta.2" unless defined?(::Bwoken::VERSION) + VERSION = "2.0.0.beta.3" unless defined?(::Bwoken::VERSION) end From c569d060c9057b7ea985a3c0699b7b43cc458673 Mon Sep 17 00:00:00 2001 From: Bradley Grzesiak and Matt Gauger Date: Mon, 18 Nov 2013 19:38:54 -0600 Subject: [PATCH 05/12] Update Gemfile.lock --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 00a86d8..4c400c9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - bwoken (2.0.0.beta.2) + bwoken (2.0.0.beta.3) coffee-script-source colorful execjs From 626e5f1d40aa9ea599586a8b2b72011c28eab1f0 Mon Sep 17 00:00:00 2001 From: Bradley Grzesiak Date: Thu, 19 Dec 2013 09:15:56 -0600 Subject: [PATCH 06/12] Add warning against using sudo [ci skip] --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 5ee3034..9610970 100644 --- a/README.md +++ b/README.md @@ -161,6 +161,8 @@ Install rvm via the instructions. Ensu ### Install +**NOTE:** Do **NOT** use `sudo` to install or run bwoken. It will almost definitely fail you. + In the terminal, inside the directory of your project (e.g., you should see a ProjectName.xcodeproj file), create .ruby-version and .ruby-gemset files and trigger their use: 
$ echo '2.0.0' > .ruby-version

From 7030c9fdd84eae3b89394aa25266ca3212f828d5 Mon Sep 17 00:00:00 2001
From: Ryan Amos 
Date: Mon, 23 Dec 2013 12:01:02 -0500
Subject: [PATCH 07/12] Fix the examples for the sdk-version command line
 option.

---
 README.md         | 2 +-
 lib/bwoken/cli.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 9610970..552a561 100644
--- a/README.md
+++ b/README.md
@@ -113,7 +113,7 @@ $ bwoken test -h
         --clobber               Remove any generated file
         --skip-build            Do not build the iOS binary
         --configuration         The build configruation to use (e.g., --configuration=Release)
-        --sdk-version           The SDK version to use (e.g., --sdk=6.1)
+        --sdk-version           The SDK version to use (e.g., --sdk-version=6.1)
         --verbose               Be verbose
     -h, --help                  Display this help message.
diff --git a/lib/bwoken/cli.rb b/lib/bwoken/cli.rb index 87cf7cc..fe67e46 100644 --- a/lib/bwoken/cli.rb +++ b/lib/bwoken/cli.rb @@ -35,7 +35,7 @@ on :clobber, 'Remove any generated file' on :'skip-build', 'Do not build the iOS binary' on :configuration=, 'The build configruation to use (e.g., --configuration=Release)', :default => 'Debug' - on :'sdk-version=', 'The SDK version to use (e.g., --sdk=6.1)' + on :'sdk-version=', 'The SDK version to use (e.g., --sdk-version=6.1)' on :verbose, 'Be verbose' run { ran_command = 'test' } From 12a4d81e4fe9874cfb2960f93d50b041d4773c5e Mon Sep 17 00:00:00 2001 From: Brad Grzesiak Date: Mon, 30 Dec 2013 11:35:26 -0600 Subject: [PATCH 08/12] Allow spaces in project's pwd --- lib/bwoken.rb | 4 ++-- lib/bwoken/build.rb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/bwoken.rb b/lib/bwoken.rb index e9c9a67..cd29a5f 100644 --- a/lib/bwoken.rb +++ b/lib/bwoken.rb @@ -66,9 +66,9 @@ def workspace_or_project def workspace_or_project_flag ws = xcworkspace if ws && File.exists?(ws) - "-workspace #{ws}" + "-workspace \"#{ws}\"" else - "-project #{xcodeproj}" + "-project \"#{xcodeproj}\"" end end diff --git a/lib/bwoken/build.rb b/lib/bwoken/build.rb index f934e37..73fcd26 100644 --- a/lib/bwoken/build.rb +++ b/lib/bwoken/build.rb @@ -51,7 +51,7 @@ def sdk def env_variables { - 'BWOKEN_CONFIGURATION_BUILD_DIR' => self.class.configuration_build_dir(simulator) + 'BWOKEN_CONFIGURATION_BUILD_DIR' => %Q|"#{self.class.configuration_build_dir(simulator)}"| } end @@ -69,7 +69,7 @@ def cmd #{scheme_string} \ -configuration #{configuration} \ -sdk #{sdk}#{sdk_version} \ - -xcconfig #{self.class.xcconfig} \ + -xcconfig \"#{self.class.xcconfig}\" \ #{variables_for_cli} \ clean build" end From e2516cbe6099c19c3cab6fa804402af16bac1b75 Mon Sep 17 00:00:00 2001 From: Brad Grzesiak Date: Mon, 30 Dec 2013 11:44:49 -0600 Subject: [PATCH 09/12] Fix failing tests. :\ --- .ruby-version | 2 +- spec/lib/bwoken/build_spec.rb | 2 +- spec/lib/bwoken_spec.rb | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.ruby-version b/.ruby-version index 2aaf252..67b8bc0 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -ruby-1.9.3-p392 +ruby-1.9.3 diff --git a/spec/lib/bwoken/build_spec.rb b/spec/lib/bwoken/build_spec.rb index 0b8ea54..b145b08 100644 --- a/spec/lib/bwoken/build_spec.rb +++ b/spec/lib/bwoken/build_spec.rb @@ -40,7 +40,7 @@ #{scheme_regex}\s+ -configuration\s+#{configuration}\s+ -sdk\s+#{sdk}#{sdk_version}\s+ - -xcconfig\s+#{xcconfig}\s+ + -xcconfig\s+"#{xcconfig}"\s+ #{variables_for_cli}\s+ clean\s+build /x diff --git a/spec/lib/bwoken_spec.rb b/spec/lib/bwoken_spec.rb index 62190ad..95d5983 100644 --- a/spec/lib/bwoken_spec.rb +++ b/spec/lib/bwoken_spec.rb @@ -32,7 +32,7 @@ File.stub(:exists? => true) stub_proj_path Bwoken.stub(:xcworkspace => "#{proj_path}/FakeProject.xcworkspace") - Bwoken.workspace_or_project_flag.should == "-workspace #{proj_path}/FakeProject.xcworkspace" + Bwoken.workspace_or_project_flag.should == "-workspace \"#{proj_path}/FakeProject.xcworkspace\"" end end @@ -41,7 +41,7 @@ File.stub(:exists? => false) stub_proj_path Bwoken.stub(:xcodeproj => "#{proj_path}/FakeProject.xcodeproj") - Bwoken.workspace_or_project_flag.should == "-project #{proj_path}/FakeProject.xcodeproj" + Bwoken.workspace_or_project_flag.should == "-project \"#{proj_path}/FakeProject.xcodeproj\"" end end end From 0c673ceeefc01d5f2e7bbcffae685cd28e86b018 Mon Sep 17 00:00:00 2001 From: Brad Grzesiak Date: Mon, 30 Dec 2013 12:03:27 -0600 Subject: [PATCH 10/12] Update README to indicate ruby 2.1.0 --- .gitignore | 1 + .ruby-version | 2 +- .travis.yml | 4 ++-- README.md | 6 +++--- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 5d18e3d..d097c13 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ rdoc spec/reports tmp bundler_bin +/.bundle/install.log diff --git a/.ruby-version b/.ruby-version index 67b8bc0..227cea2 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -ruby-1.9.3 +2.0.0 diff --git a/.travis.yml b/.travis.yml index c1ce77a..9a84804 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ language: ruby rvm: - - 1.8.7 - - 1.9.3 + - 2.0.0 + - 2.1.0 script: 'bundle exec rspec spec' diff --git a/README.md b/README.md index 552a561..fff5e69 100644 --- a/README.md +++ b/README.md @@ -165,7 +165,7 @@ Install rvm via the instructions. Ensu In the terminal, inside the directory of your project (e.g., you should see a ProjectName.xcodeproj file), create .ruby-version and .ruby-gemset files and trigger their use: -
$ echo '2.0.0' > .ruby-version
+
$ echo '2.1.0' > .ruby-version
 $ echo 'my_project' > .ruby-gemset
 $ cd .
 

@@ -178,7 +178,7 @@ $ bundle init
 
 This will create a Gemfile. Add bwoken to it and bundle:
 
-
$ echo "gem 'bwoken', '2.0.0.beta.1'" >> Gemfile
+
$ echo "gem 'bwoken', '2.0.0.beta.3'" >> Gemfile
 $ bundle
 

 
@@ -191,7 +191,7 @@ Now, you can start using it!
 
 #### The Dirty Little Installation Method
 
-Technically, you can skip this entire Installation section and just run `sudo gem install bwoken && bwoken init`. This is listed here for completeness, but you really shouldn't install gems this way.
+Technically, you can skip this entire Installation section and just run `sudo gem install bwoken && bwoken init`. This is listed here for completeness, but you really shouldn't install gems this way. This installation method will almost certainly not work with versions of OS X prior to Mavericks.
 
 ## Contributors
 

From 285f9d5fde0b85456bb279d9ba5efff8ed426d4c Mon Sep 17 00:00:00 2001
From: Brad Grzesiak 
Date: Mon, 30 Dec 2013 12:33:25 -0600
Subject: [PATCH 11/12] Remove ruby 1.8 compilation functions

---
 lib/bwoken/build.rb | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/lib/bwoken/build.rb b/lib/bwoken/build.rb
index 73fcd26..a1cace2 100644
--- a/lib/bwoken/build.rb
+++ b/lib/bwoken/build.rb
@@ -77,7 +77,7 @@ def cmd
     def compile
       formatter.before_build_start
 
-      succeeded, out_string, err_string = RUBY_VERSION == '1.8.7' ? compile_18 : compile_19_plus
+      succeeded, out_string, err_string = compile_19_plus
 
       if succeeded
         formatter.build_successful out_string
@@ -87,16 +87,6 @@ def compile
       end
     end
 
-    def compile_18
-      out_string, err_string = '', ''
-      a, b, c = Open3.popen3(cmd) do |stdin, stdout, stderr|
-        out_string = formatter.format_build stdout
-        err_string = stderr.read
-      end
-
-      [a.to_s !~ /BUILD FAILED/, out_string, err_string]
-    end
-
     def compile_19_plus
       ret = nil
       Open3.popen3(cmd) do |stdin, stdout, stderr, wait_thr|

From 23adc58ab3642ce22c9fef1c97e611b1784754b8 Mon Sep 17 00:00:00 2001
From: Brad Grzesiak 
Date: Mon, 30 Dec 2013 15:58:30 -0600
Subject: [PATCH 12/12] Release the 2.0.0!

---
 CHANGELOG             | 12 ++++++++++++
 Gemfile.lock          |  2 +-
 lib/bwoken/version.rb |  2 +-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 4bd4dc9..25c234a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,15 @@
+Version 2.0.0 2013-12-30 Brad Grzesiak 
+
+    * Use `bwoken` at the command line instead of `rake`.
+    * Allow spaces in the pwd of your project.
+    * Allow much more configuration of the builder and test runner.
+    * Deprecate Ruby 1.x. You must now use Ruby 2.x. (2.0.0 comes standard with Mavericks; other versions installable via RVM or rbenv)
+    * Deprecate invocation via `rake`.
+
+Version 1.3.0
+
+Version 1.2.0
+
 Version 1.1.0 2012-7-5 Brad Grzesiak  and Jaymes Waters 
 
     * Add device support.
diff --git a/Gemfile.lock b/Gemfile.lock
index 4c400c9..d86507a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bwoken (2.0.0.beta.3)
+    bwoken (2.0.0)
       coffee-script-source
       colorful
       execjs
diff --git a/lib/bwoken/version.rb b/lib/bwoken/version.rb
index e58965b..d283983 100644
--- a/lib/bwoken/version.rb
+++ b/lib/bwoken/version.rb
@@ -1,3 +1,3 @@
 module Bwoken
-  VERSION = "2.0.0.beta.3" unless defined?(::Bwoken::VERSION)
+  VERSION = "2.0.0" unless defined?(::Bwoken::VERSION)
 end