hudson 0.3.1 → 0.5.0

data/.gitignore

@@ -0,0 +1,4 @@
+hudson-*.gem
+tmp
+*.rbc
+.bundle

data/Changelog.md

@@ -1,5 +1,29 @@
 # Changelog
 
+## 0.5.0 - 2010/12/1
+
+* hudson warfile no longer bundled with hudson gem
+  * rubygem is now 235K instead of 31M!
+  * upgrade hudson server and related plugins without requiring a new gem release
+* hudson gem now fully drinks the bundler koolaid.
+* hudson create
+  * --node-labels 'ubuntu,gentoo' - run tests against multiple slave nodes by their label
+  * --no-template - do not generate any default steps (well, a silly one)
+* hudson add_node
+  * --vagrant - provide alternate default values when adding nodes if the node is a Vagrant VM
+* hudson default_host
+  * NEW - displays the current default host:port URI
+
+## 0.4.0 - 2010/11/11
+
+* hudson create
+  * --rubies '1.8.7,1.9.2,rbx-head,jruby' - uses RVM and Hudson's Axes support to run tests within different Ruby environments
+  * --scm git://some-alternate.com/repo.git - can override the "origin" URI
+  * --scm-branches 'master,other,branches' - specify which branches can be pulled from to trigger tests
+
+* hudson job
+  * Can dump information/status about a job
+
 ## 0.3.1 - 2010/11/8
 
 * fixed error in the rails3 template's test for schema.rb

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    hudson (0.3.1)
+    hudson (0.5.0)
       builder (~> 2.1.2)
       hpricot
       httparty (~> 0.6.1)

data/Rakefile

@@ -1,52 +1,5 @@
-require 'rubygems'
-require 'bundler/setup'
-
-$:.unshift('lib')
-require 'hudson'
-
-Gem::Specification.new do |s|
-  $gemspec = s
-  s.name = s.rubyforge_project =  "hudson"
-  s.version = Hudson::VERSION
-  s.summary = "Painless Continuous Integration with Hudson Server"
-  s.description = "A suite of utilities for bringing continous integration to your projects (not the other way around) with hudson CI"
-  s.email = ["cowboyd@thefrontside.net", "drnicwilliams@gmail.com"]
-  s.homepage = "http://github.com/cowboyd/hudson.rb"
-  s.authors = ["Charles Lowell", "Dr Nic Williams"]
-  s.executables = ["hudson"]
-  s.require_paths = ["lib"]
-  s.files = Rake::FileList.new("**/*").tap do |manifest|
-    manifest.exclude "tmp", "**/*.gem"
-  end.to_a
-  s.add_dependency("term-ansicolor", [">= 1.0.4"])
-  s.add_dependency("yajl-ruby", [">= 0.7.6"])
-  s.add_dependency("httparty", ["~> 0.6.1"])
-  s.add_dependency("builder", ["~> 2.1.2"])
-  s.add_dependency("thor", ["~> 0.14.2"])
-  s.add_dependency("hpricot")
-  s.add_development_dependency("rake", ["~> 0.8.7"])
-  s.add_development_dependency("cucumber", ["~> 0.9.0"])
-  s.add_development_dependency("rspec", ["~> 2.0.0"])
-  s.add_development_dependency("json", ["~>1.4.0"])
-  s.add_development_dependency("awesome_print")
-end
-
-desc "Build gem"
-task :gem => :gemspec do
-  Gem::Builder.new($gemspec).build
-end
-
-desc "Build gemspec"
-task :gemspec => :clean do
-  File.open("#{$gemspec.name}.gemspec", "w") do |f|
-    f.write($gemspec.to_ruby)
-  end
-end
-
-desc "Clean up"
-task :clean do
-  sh "rm -rf *.gem"
-end
+require 'bundler'
+Bundler::GemHelper.install_tasks
 
 require "rspec/core/rake_task"
 RSpec::Core::RakeTask.new(:spec)
@@ -68,6 +21,7 @@ task :cucumber => 'cucumber:ok'
 desc "Start test server; Run cucumber:ok; Kill Test Server;"
 task :default => [:spec, "hudson:server:killtest", "hudson:server:test"] do
   require 'socket'
+  require 'net/http'
   print "waiting for at most 30 seconds for the server to start"
   tries = 1
   begin
@@ -100,7 +54,7 @@ namespace :hudson do
     task :test do
       port = 3010
       control = 3011
-
+      ENV['HUDSON_STOCK'] = File.expand_path(File.dirname(__FILE__) + "/fixtures/hudson")
       FileUtils.chdir(File.dirname(__FILE__)) do
         logfile = File.join("/tmp", "test_hudson.log")
         puts "Launching hudson test server at http://localhost:#{port}..."

data/features/default_host.feature

@@ -0,0 +1,19 @@
+Feature: Display default host information
+
+  Scenario: Display default host information if it is setup
+    Given I run local executable "hudson" with arguments "list --host localhost --port 3010"
+    When I run local executable "hudson" with arguments "default_host"
+    Then I should see exactly
+      """
+      http://localhost:3010
+      """
+
+  Scenario: Display warning if never used Hudson.rb before
+    When I run local executable "hudson" with arguments "default_host"
+    Then I should see exactly
+      """
+      ERROR: Either use --host or add remote servers.
+      """
+  
+  
+  

data/features/development.feature

@@ -7,8 +7,8 @@ Feature: Development processes of hudson itself (rake tasks)
   Scenario: Generate RubyGem
     Given this project is active project folder
     When I invoke task "rake clean" so that I start with nothing
-    And I invoke task "rake gem"
-    Then file with name matching "hudson-*.gem" is created
+    And I invoke task "rake build"
+    Then file with name matching "pkg/hudson-*.gem" is created
     And file with name matching "hudson.gemspec" is created
     And the file "hudson.gemspec" is a valid gemspec
 

data/features/launch_server.feature

@@ -6,6 +6,7 @@ Feature: Running a Hudson Server
   Scenario: Start a Hudson Server (hudson server)
     Given env variable $HOME set to project path "home"
       And "home/.hudson" folder is deleted
+      And hudson is using a stock warfile
       And there is nothing listening on port 5001
       And there is nothing listening on port 5002
       And I cleanup any hudson processes with control port 5002

data/features/manage_jobs.feature

@@ -1,4 +1,4 @@
-Feature: Create jobs
+Feature: Create and manage jobs
   In order to reduce cost of getting a new project up onto Hudson
   As a project developer
   I want to add a new project to Hudson as a job
@@ -44,6 +44,100 @@ Feature: Create jobs
         CLI: hudson build ruby
       """
 
+  Scenario: Setup hudson job with explicit scm url/branches (hudson create --scm URI --scm-branches='master,other')
+    Given I am in the "ruby" project folder
+    And the project uses "git" scm
+    When I run local executable "hudson" with arguments "create . --scm git://localhost/myapp.git --scm-branches 'master,other' --host localhost --port 3010"
+    Then I should see "Added ruby project 'ruby' to Hudson."
+    And the job "ruby" config "scm" should be:
+      """
+      <scm class="hudson.plugins.git.GitSCM">
+          <configVersion>1</configVersion>
+          <remoteRepositories>
+            <org.spearce.jgit.transport.RemoteConfig>
+              <string>origin</string>
+              <int>5</int>
+              <string>fetch</string>
+              <string>+refs/heads/*:refs/remotes/origin/*</string>
+              <string>receivepack</string>
+              <string>git-upload-pack</string>
+              <string>uploadpack</string>
+              <string>git-upload-pack</string>
+              <string>url</string>
+              <string>git://localhost/myapp.git</string>
+              <string>tagopt</string>
+              <string></string>
+            </org.spearce.jgit.transport.RemoteConfig>
+          </remoteRepositories>
+          <branches>
+            <hudson.plugins.git.BranchSpec>
+              <name>master</name>
+            </hudson.plugins.git.BranchSpec>
+            <hudson.plugins.git.BranchSpec>
+              <name>other</name>
+            </hudson.plugins.git.BranchSpec>
+          </branches>
+          <localBranch></localBranch>
+          <mergeOptions />
+          <recursiveSubmodules>false</recursiveSubmodules>
+          <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+          <authorOrCommitter>false</authorOrCommitter>
+          <clean>false</clean>
+          <wipeOutWorkspace>false</wipeOutWorkspace>
+          <buildChooser class="hudson.plugins.git.util.DefaultBuildChooser" />
+          <gitTool>Default</gitTool>
+          <submoduleCfg class="list" />
+          <relativeTargetDir></relativeTargetDir>
+          <excludedRegions></excludedRegions>
+          <excludedUsers></excludedUsers>
+        </scm>
+      """
+
+  Scenario: Setup hudson job with multiple rubies (hudson create --rubies '1.8.7,rbx-head,jruby')
+    Given I am in the "ruby" project folder
+    And the project uses "git" scm
+    When I run local executable "hudson" with arguments "create . --rubies '1.8.7,rbx-head,jruby' --host localhost --port 3010"
+    Then I should see "Added ruby project 'ruby' to Hudson."
+    And the job "ruby" config "axes" should be:
+      """
+      <axes>
+          <hudson.matrix.TextAxis>
+            <name>RUBY_VERSION</name>
+            <values>
+              <string>1.8.7</string>
+              <string>rbx-head</string>
+              <string>jruby</string>
+            </values>
+          </hudson.matrix.TextAxis>
+        </axes>
+      """
+
+  Scenario: Setup hudson job with multiple rubies and multiple nodes (hudson create --rubies.. --node_labels..)
+    Given I am in the "ruby" project folder
+    And the project uses "git" scm
+    When I run local executable "hudson" with arguments "create . --rubies '1.8.7,rbx-head,jruby' --node-labels '1.8.7,ubuntu' --host localhost --port 3010"
+    Then I should see "Added ruby project 'ruby' to Hudson."
+    And the job "ruby" config "axes" should be:
+      """
+      <axes>
+          <hudson.matrix.TextAxis>
+            <name>RUBY_VERSION</name>
+            <values>
+              <string>1.8.7</string>
+              <string>rbx-head</string>
+              <string>jruby</string>
+            </values>
+          </hudson.matrix.TextAxis>
+          <hudson.matrix.LabelAxis>
+            <name>label</name>
+            <values>
+              <string>1.8.7</string>
+              <string>ubuntu</string>
+            </values>
+          </hudson.matrix.LabelAxis>
+        </axes>
+      """
+  
   Scenario: Setup hudson job for a specific node label (hudson create --assigned_node)
     Given I am in the "ruby" project folder
     And the project uses "git" scm
@@ -56,6 +150,20 @@ Feature: Create jobs
     When I run local executable "hudson" with arguments "create . --template rails3 --host localhost --port 3010"
     Then I should see "Added rails3 project 'rails-3' to Hudson."
 
+  Scenario: Create job without default steps (hudson create --no-template)
+    Given I am in the "non-bundler" project folder
+    And the project uses "git" scm
+    When I run local executable "hudson" with arguments "create . --no-template --host localhost --port 3010"
+    Then I should see "Added project 'non-bundler' to Hudson."
+    And the job "non-bundler" config "builders" should be:
+      """
+      <builders>
+          <hudson.tasks.Shell>
+            <command>echo &quot;THERE ARE NO STEPS! Except this one...&quot;</command>
+          </hudson.tasks.Shell>
+        </builders>
+      """
+
   Scenario: Reject projects that don't use bundler (hudson create)
     Given I am in the "non-bundler" project folder
     And the project uses "git" scm

data/features/manage_slave_nodes.feature

@@ -26,12 +26,12 @@ Feature: Adding slave nodes
       """
 
   Scenario: Add slave via CLI with name defaulted to URL (hudson add_node)
-    When I run local executable "hudson" with arguments "add_node foo1.bar.com --slave-user deploy --label 'app1 app2' --host localhost --port 3010"
+    When I run local executable "hudson" with arguments "add_node foo1.bar.com --slave-user deploy --labels 'app1,app2'"
     Then I should see exactly
       """
-      Added slave node foo1.bar.com
+      Added slave node 'foo1.bar.com' to foo1.bar.com
       """
-    When I run local executable "hudson" with arguments "add_node foo1.bar.com --slave-user deploy --label 'app1 app2' --host localhost --port 3010"
+    When I run local executable "hudson" with arguments "add_node foo1.bar.com --slave-user deploy --labels 'app1,app2'"
     Then I should see exactly
       """
       Slave called 'foo1.bar.com' already exists
@@ -42,4 +42,39 @@ Feature: Adding slave nodes
       """
       master
       foo1.bar.com
-      """
+      """
+
+  Scenario: Add a local Vagrant/VirtualBox VM as a slave (hudson add_node --vagrant)
+    Given I am in the "rails-3" project folder
+    When I run local executable "hudson" with arguments "add_node localhost --name rails-3 --vagrant --labels 'app1,app2'"
+    Then I should see exactly
+      """
+      Added slave node 'rails-3' to localhost
+      """
+    When I run local executable "hudson" with arguments "nodes"
+    Then I should see exactly
+      """
+      master
+      rails-3
+      """
+    And the Hudson config "slaves" should be:
+      """
+      <slaves>
+          <slave>
+            <name>rails-3</name>
+            <description>Automatically created by Hudson.rb</description>
+            <remoteFS>/vagrant/tmp/hudson-slave/</remoteFS>
+            <numExecutors>2</numExecutors>
+            <mode>EXCLUSIVE</mode>
+            <retentionStrategy class="hudson.slaves.RetentionStrategy$Always" />
+            <launcher class="hudson.plugins.sshslaves.SSHLauncher">
+              <host>localhost</host>
+              <port>2222</port>
+              <username>vagrant</username>
+              <privatekey>/Library/Ruby/Gems/1.8/gems/vagrant-0.6.7/keys/vagrant</privatekey>
+            </launcher>
+            <label>app1 app2</label>
+            <nodeProperties />
+          </slave>
+        </slaves>
+      """

data/features/step_definitions/common_steps.rb

@@ -1,3 +1,9 @@
+
+
+Given /^hudson is using a stock warfile$/ do
+  ENV['HUDSON_STOCK'] = File.expand_path(File.dirname(__FILE__) + '/../../fixtures/hudson')
+end
+
 Given /^this project is active project folder/ do
   @active_project_folder = File.expand_path(File.dirname(__FILE__) + "/../..")
 end

data/features/step_definitions/hudson_steps.rb

@@ -5,8 +5,7 @@ Given /^I have a Hudson server running$/ do
       res = Net::HTTP.start("localhost", port) { |http| http.get('/api/json') }
       Hudson::Api.base_uri "http://localhost:#{port}"
     rescue Errno::ECONNREFUSED => e
-      puts "\n\n\nERROR: To run tests, launch hudson in test mode: 'rake hudson:server:test'\n\n\n"
-      exit
+      raise Exception, "To run tests, launch hudson in test mode: 'rake hudson:server:test'"
     end
     @hudson_port = port.to_s
     @hudson_host = 'localhost'
@@ -89,5 +88,17 @@ When /^I (re|)create a job$/ do |override|
   CUCUMBER
 end
 
+Then /^the job "([^"]*)" config "([^"]*)" should be:$/ do |job_name, xpath, string|
+  raise "Cannot yet fetch XML config from non-localhost Hudson" unless Hudson::Api.base_uri =~ /localhost/
+  require "hpricot"
+  config = Hpricot.XML(File.read("#{test_hudson_path}/jobs/#{job_name}/config.xml"))
+  config.search(xpath).to_s.should == string
+end
 
+Then /^the Hudson config "([^"]*)" should be:$/ do |xpath, string|
+  raise "Cannot yet fetch XML config from non-localhost Hudson" unless Hudson::Api.base_uri =~ /localhost/
+  require "hpricot"
+  config = Hpricot.XML(File.read("#{test_hudson_path}/config.xml"))
+  config.search(xpath).to_s.should == string
+end
 

data/features/support/hudson_helpers.rb

@@ -0,0 +1,6 @@
+module HudsonHelper
+  def test_hudson_path
+    "/tmp/test_hudson"
+  end
+end
+World(HudsonHelper)

data/hudson.gemspec

@@ -1,63 +1,33 @@
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "hudson/version"
 
 Gem::Specification.new do |s|
-  s.name = %q{hudson}
-  s.version = "0.3.1"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Charles Lowell", "Dr Nic Williams"]
-  s.date = %q{2010-11-08}
-  s.default_executable = %q{hudson}
+  s.name        = "hudson"
+  s.version     = Hudson::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["Charles Lowell", "Nic Williams"]
+  s.email       = ["cowboyd@thefrontside.net", "drnicwilliams@gmail.com"]
+  s.homepage    = "http://github.com/cowboyd/hudson.rb"
+  s.summary     = %q{Painless Continuous Integration with Hudson Server}
   s.description = %q{A suite of utilities for bringing continous integration to your projects (not the other way around) with hudson CI}
-  s.email = ["cowboyd@thefrontside.net", "drnicwilliams@gmail.com"]
-  s.executables = ["hudson"]
-  s.files = ["bin", "bin/hudson", "Changelog.md", "features", "features/development.feature", "features/launch_server.feature", "features/listing_jobs.feature", "features/manage_jobs.feature", "features/manage_slave_nodes.feature", "features/step_definitions", "features/step_definitions/common_steps.rb", "features/step_definitions/fixture_project_steps.rb", "features/step_definitions/hudson_steps.rb", "features/step_definitions/scm_steps.rb", "features/support", "features/support/common.rb", "features/support/env.rb", "features/support/hooks.rb", "features/support/matchers.rb", "fixtures", "fixtures/projects", "fixtures/projects/non-bundler", "fixtures/projects/non-bundler/Rakefile", "fixtures/projects/rails-3", "fixtures/projects/rails-3/app", "fixtures/projects/rails-3/app/controllers", "fixtures/projects/rails-3/app/controllers/application_controller.rb", "fixtures/projects/rails-3/app/helpers", "fixtures/projects/rails-3/app/helpers/application_helper.rb", "fixtures/projects/rails-3/app/mailers", "fixtures/projects/rails-3/app/models", "fixtures/projects/rails-3/app/views", "fixtures/projects/rails-3/app/views/layouts", "fixtures/projects/rails-3/app/views/layouts/application.html.erb", "fixtures/projects/rails-3/config", "fixtures/projects/rails-3/config/application.rb", "fixtures/projects/rails-3/config/boot.rb", "fixtures/projects/rails-3/config/database.yml", "fixtures/projects/rails-3/config/environment.rb", "fixtures/projects/rails-3/config/environments", "fixtures/projects/rails-3/config/environments/development.rb", "fixtures/projects/rails-3/config/environments/production.rb", "fixtures/projects/rails-3/config/environments/test.rb", "fixtures/projects/rails-3/config/initializers", "fixtures/projects/rails-3/config/initializers/backtrace_silencers.rb", "fixtures/projects/rails-3/config/initializers/inflections.rb", "fixtures/projects/rails-3/config/initializers/mime_types.rb", "fixtures/projects/rails-3/config/initializers/secret_token.rb", "fixtures/projects/rails-3/config/initializers/session_store.rb", "fixtures/projects/rails-3/config/locales", "fixtures/projects/rails-3/config/locales/en.yml", "fixtures/projects/rails-3/config/routes.rb", "fixtures/projects/rails-3/config.ru", "fixtures/projects/rails-3/db", "fixtures/projects/rails-3/db/seeds.rb", "fixtures/projects/rails-3/doc", "fixtures/projects/rails-3/doc/README_FOR_APP", "fixtures/projects/rails-3/Gemfile", "fixtures/projects/rails-3/Gemfile.lock", "fixtures/projects/rails-3/lib", "fixtures/projects/rails-3/lib/tasks", "fixtures/projects/rails-3/log", "fixtures/projects/rails-3/log/development.log", "fixtures/projects/rails-3/log/production.log", "fixtures/projects/rails-3/log/server.log", "fixtures/projects/rails-3/log/test.log", "fixtures/projects/rails-3/public", "fixtures/projects/rails-3/public/404.html", "fixtures/projects/rails-3/public/422.html", "fixtures/projects/rails-3/public/500.html", "fixtures/projects/rails-3/public/favicon.ico", "fixtures/projects/rails-3/public/images", "fixtures/projects/rails-3/public/images/rails.png", "fixtures/projects/rails-3/public/index.html", "fixtures/projects/rails-3/public/javascripts", "fixtures/projects/rails-3/public/javascripts/application.js", "fixtures/projects/rails-3/public/javascripts/controls.js", "fixtures/projects/rails-3/public/javascripts/dragdrop.js", "fixtures/projects/rails-3/public/javascripts/effects.js", "fixtures/projects/rails-3/public/javascripts/prototype.js", "fixtures/projects/rails-3/public/javascripts/rails.js", "fixtures/projects/rails-3/public/robots.txt", "fixtures/projects/rails-3/public/stylesheets", "fixtures/projects/rails-3/Rakefile", "fixtures/projects/rails-3/README", "fixtures/projects/rails-3/script", "fixtures/projects/rails-3/script/rails", "fixtures/projects/rails-3/test", "fixtures/projects/rails-3/test/fixtures", "fixtures/projects/rails-3/test/functional", "fixtures/projects/rails-3/test/integration", "fixtures/projects/rails-3/test/performance", "fixtures/projects/rails-3/test/performance/browsing_test.rb", "fixtures/projects/rails-3/test/test_helper.rb", "fixtures/projects/rails-3/test/unit", "fixtures/projects/rails-3/vendor", "fixtures/projects/rails-3/vendor/plugins", "fixtures/projects/ruby", "fixtures/projects/ruby/Gemfile", "fixtures/projects/ruby/Gemfile.lock", "fixtures/projects/ruby/Rakefile", "Gemfile", "Gemfile.lock", "hudson.gemspec", "lib", "lib/hudson", "lib/hudson/api.rb", "lib/hudson/cli", "lib/hudson/cli/formatting.rb", "lib/hudson/cli.rb", "lib/hudson/config.rb", "lib/hudson/core_ext", "lib/hudson/core_ext/hash.rb", "lib/hudson/core_ext/object", "lib/hudson/core_ext/object/blank.rb", "lib/hudson/hudson-cli.jar", "lib/hudson/hudson.war", "lib/hudson/hudson_version.rb", "lib/hudson/job_config_builder.rb", "lib/hudson/plugins", "lib/hudson/plugins/envfile.hpi", "lib/hudson/plugins/git.hpi", "lib/hudson/plugins/github.hpi", "lib/hudson/plugins/greenballs.hpi", "lib/hudson/plugins/rake.hpi", "lib/hudson/plugins/ruby.hpi", "lib/hudson/project_scm.rb", "lib/hudson/remote.rb", "lib/hudson/version.rb", "lib/hudson.rb", "Rakefile", "README.md", "spec", "spec/fixtures", "spec/fixtures/ec2_global.config.xml", "spec/fixtures/rails.multi.config.xml", "spec/fixtures/rails.single.config.triggers.xml", "spec/fixtures/rails.single.config.xml", "spec/fixtures/ruby.single.config.xml", "spec/fixtures/rubygem.config.xml", "spec/fixtures/therubyracer.config.xml", "spec/hash_key_cleaner_spec.rb", "spec/job_config_builder_spec.rb", "spec/spec_helper.rb", "tasks", "tasks/upgrade.rake"]
-  s.homepage = %q{http://github.com/cowboyd/hudson.rb}
-  s.require_paths = ["lib"]
-  s.rubyforge_project = %q{hudson}
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Painless Continuous Integration with Hudson Server}
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+  s.rubyforge_project = "hudson"
+
+  s.files         = `git ls-files -x fixtures`.split("\n").reject {|f| f =~ /^fixtures/}
+
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<term-ansicolor>, [">= 1.0.4"])
-      s.add_runtime_dependency(%q<yajl-ruby>, [">= 0.7.6"])
-      s.add_runtime_dependency(%q<httparty>, ["~> 0.6.1"])
-      s.add_runtime_dependency(%q<builder>, ["~> 2.1.2"])
-      s.add_runtime_dependency(%q<thor>, ["~> 0.14.2"])
-      s.add_runtime_dependency(%q<hpricot>, [">= 0"])
-      s.add_development_dependency(%q<rake>, ["~> 0.8.7"])
-      s.add_development_dependency(%q<cucumber>, ["~> 0.9.0"])
-      s.add_development_dependency(%q<rspec>, ["~> 2.0.0"])
-      s.add_development_dependency(%q<json>, ["~> 1.4.0"])
-      s.add_development_dependency(%q<awesome_print>, [">= 0"])
-    else
-      s.add_dependency(%q<term-ansicolor>, [">= 1.0.4"])
-      s.add_dependency(%q<yajl-ruby>, [">= 0.7.6"])
-      s.add_dependency(%q<httparty>, ["~> 0.6.1"])
-      s.add_dependency(%q<builder>, ["~> 2.1.2"])
-      s.add_dependency(%q<thor>, ["~> 0.14.2"])
-      s.add_dependency(%q<hpricot>, [">= 0"])
-      s.add_dependency(%q<rake>, ["~> 0.8.7"])
-      s.add_dependency(%q<cucumber>, ["~> 0.9.0"])
-      s.add_dependency(%q<rspec>, ["~> 2.0.0"])
-      s.add_dependency(%q<json>, ["~> 1.4.0"])
-      s.add_dependency(%q<awesome_print>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<term-ansicolor>, [">= 1.0.4"])
-    s.add_dependency(%q<yajl-ruby>, [">= 0.7.6"])
-    s.add_dependency(%q<httparty>, ["~> 0.6.1"])
-    s.add_dependency(%q<builder>, ["~> 2.1.2"])
-    s.add_dependency(%q<thor>, ["~> 0.14.2"])
-    s.add_dependency(%q<hpricot>, [">= 0"])
-    s.add_dependency(%q<rake>, ["~> 0.8.7"])
-    s.add_dependency(%q<cucumber>, ["~> 0.9.0"])
-    s.add_dependency(%q<rspec>, ["~> 2.0.0"])
-    s.add_dependency(%q<json>, ["~> 1.4.0"])
-    s.add_dependency(%q<awesome_print>, [">= 0"])
-  end
+  s.add_dependency("term-ansicolor", [">= 1.0.4"])
+  s.add_dependency("yajl-ruby", [">= 0.7.6"])
+  s.add_dependency("httparty", ["~> 0.6.1"])
+  s.add_dependency("builder", ["~> 2.1.2"])
+  s.add_dependency("thor", ["~> 0.14.2"])
+  s.add_dependency("hpricot")
+  s.add_development_dependency("rake", ["~> 0.8.7"])
+  s.add_development_dependency("cucumber", ["~> 0.9.0"])
+  s.add_development_dependency("rspec", ["~> 2.0.0"])
+  s.add_development_dependency("json", ["~>1.4.0"])
+  s.add_development_dependency("awesome_print")
 end