tddium-preview 0.6.6 → 0.6.7

data/lib/tddium.rb

@@ -307,7 +307,7 @@ class Tddium < Thor
         current_suite = call_api(:get, current_suite_path)["suite"]
 
         say Text::Process::EXISTING_SUITE % format_suite_details(current_suite)
-        #prompt_update_suite(current_suite, options)
+        prompt_update_suite(current_suite, options)
       else
         params[:branch] = current_git_branch
         default_suite_name = File.basename(Dir.pwd)
@@ -319,14 +319,9 @@ class Tddium < Thor
           # Write to file and exit when using the existing suite
           write_suite(existing_suite["id"])
           say Text::Status::USING_SUITE % format_suite_details(existing_suite)
-          #prompt_update_suite(existing_suite, options)
           return
         end
 
-        params[:ruby_version] = dependency_version(:ruby)
-        params[:bundler_version] = dependency_version(:bundle)
-        params[:rubygems_version] = dependency_version(:gem)
-
         prompt_suite_params(options, params)
 
         # Create new suite if it does not exist yet
@@ -452,6 +447,7 @@ class Tddium < Thor
     say Text::Process::HEROKU_WELCOME % heroku_config['TDDIUM_USER_NAME']
 
     if user["user"]["heroku_needs_activation"] == true
+      say Text::Process::HEROKU_ACTIVATE
       params = get_user_credentials(:email => heroku_config['TDDIUM_USER_NAME'])
       params.delete(:email)
       params[:password_confirmation] = HighLine.ask(Text::Prompt::PASSWORD_CONFIRMATION) { |q| q.echo = "*" }
@@ -494,21 +490,40 @@ class Tddium < Thor
     data
   end
 
-  def prompt_suite_params(options, params)
-    params[:test_pattern] = prompt(Text::Prompt::TEST_PATTERN, options[:test_pattern], Default::SUITE_TEST_PATTERN)
-    if prompt(Text::Prompt::ENABLE_CI, options[:pull_url] ? 'y' : nil, 'n') == Text::Prompt::Response::YES
-      params[:ci_pull_url] = prompt(Text::Prompt::CI_PULL_URL, options[:pull_url], nil)
-      params[:ci_push_url] = prompt(Text::Prompt::CI_PUSH_URL, options[:push_url], nil)
-      if prompt(Text::Prompt::ENABLE_CAMPFIRE, nil, 'n') == Text::Prompt::Response::YES
-        params[:campfire_subdomain] = prompt(Text::Prompt::CAMPFIRE_SUBDOMAIN, options[:campfire_subdomain], nil)
-        params[:campfire_token] = prompt(Text::Prompt::CAMPFIRE_TOKEN, options[:campfire_token], nil)
-        params[:campfire_room] = prompt(Text::Prompt::CAMPFIRE_ROOM, options[:campfire_room], nil)
+  def prompt_suite_params(options, params, current={})
+    params[:ruby_version] = dependency_version(:ruby)
+    params[:bundler_version] = dependency_version(:bundle)
+    params[:rubygems_version] = dependency_version(:gem)
+
+    ask_or_update = lambda do |key, text, default|
+      params[key] = prompt(text, options[key], current.fetch(key.to_s, default))
+    end
+
+    ask_subsection = lambda do |key, text|
+      current[key.to_s] ||
+      prompt(text, options[key] ? 'y' : nil, 'n') == Text::Prompt::Response::YES
+    end
+
+    ask_or_update.call(:test_pattern, Text::Prompt::TEST_PATTERN, Default::SUITE_TEST_PATTERN)
+
+    if ask_subsection.call(:ci_pull_url, Text::Prompt::ENABLE_CI)
+      ask_or_update.call(:ci_pull_url, Text::Prompt::CI_PULL_URL, nil)
+      ask_or_update.call(:ci_push_url, Text::Prompt::CI_PUSH_URL, nil)
+      if ask_subsection.call(:campfire_subdomain, Text::Prompt::ENABLE_CAMPFIRE)
+        ask_or_update.call(:campfire_subdomain, Text::Prompt::CAMPFIRE_SUBDOMAIN, nil)
+        ask_or_update.call(:campfire_token, Text::Prompt::CAMPFIRE_TOKEN, nil)
+        ask_or_update.call(:campfire_room, Text::Prompt::CAMPFIRE_ROOM, nil)
       end
     end
   end
 
-  def prompt_update_suite(api_response, options)
-    say Text::Prompt::UPDATE_SUITE
+  def prompt_update_suite(suite, options)
+    if prompt(Text::Prompt::UPDATE_SUITE, nil, 'n') == Text::Prompt::Response::YES
+      params = {}
+      prompt_suite_params(options, params, suite)
+      call_api(:put, "#{Api::Path::SUITES}/#{suite['id']}", params)
+      say Text::Process::UPDATED_SUITE
+    end
   end
 
   def resolve_suite_name(options, params, default_suite_name)

data/lib/tddium/constant.rb

@@ -60,12 +60,12 @@ module TddiumConstant
       TEST_PATTERN = "Enter a test pattern or press 'Return'. Using '%s' by default:"
       ENABLE_CI = "Do you want to configure Hosted Continuous Integration?"
       UPDATE_SUITE = "Do you want to edit settings for this suite?"
-      CI_PULL_URL = "Enter a git URL to pull from:"
-      CI_PUSH_URL = "Enter a git URL to push when tests pass (blank to disable):"
+      CI_PULL_URL = "Enter a git URL to pull from (default '%s'):"
+      CI_PUSH_URL = "Push to git URL on tests pass (unset=disable) (default '%s'):"
       ENABLE_CAMPFIRE = "Setup Campfire CI notifications?"
-      CAMPFIRE_SUBDOMAIN = "Enter your Campfire subdomain:"
-      CAMPFIRE_ROOM = "Enter the Campfire room name:"
-      CAMPFIRE_TOKEN = "Enter your Campfire API Token:"
+      CAMPFIRE_SUBDOMAIN = "Enter your Campfire subdomain (default '%s'):"
+      CAMPFIRE_ROOM = "Enter the Campfire room name (default '%s'):"
+      CAMPFIRE_TOKEN = "Enter your Campfire API Token (default '%s'):"
     end
 
     module Process
@@ -108,10 +108,13 @@ Thanks for installing the Tddium Heroku Add-On!
 
 Your tddium username is: %s
 
+"
+      HEROKU_ACTIVATE = "
 Next, set a password and provide an SSH key to authenticate your communication
 with Tddium.
-
 "
+      UPDATED_SUITE = "Updated suite successfully."
+
     end
 
     module Status

data/lib/tddium/heroku.rb

@@ -33,6 +33,7 @@ class HerokuConfig
       line.chomp!
       k, v = line.split('=')
       if k =~ /^TDDIUM_/ && v.length > 0
+        k.sub!("TDDIUM_STAGE", "TDDIUM")
         config[k] = v
       end
     end

data/lib/tddium/version.rb

@@ -3,5 +3,5 @@ Copyright (c) 2011 Solano Labs All Rights Reserved
 =end
 
 module TddiumVersion
-  VERSION = "0.6.6"
+  VERSION = "0.6.7"
 end

data/spec/tddium_spec.rb

@@ -1324,6 +1324,28 @@ describe Tddium do
       tddium.stub(:ask).and_return("")
     end
 
+    shared_examples_for "prompting for suite configuration" do
+      context "enable ci and campfire" do
+        before do
+          tddium.stub(:ask).with(Tddium::Text::Prompt::ENABLE_CI).and_return(Tddium::Text::Prompt::Response::YES)
+          tddium.stub(:ask).with(Tddium::Text::Prompt::ENABLE_CAMPFIRE).and_return(Tddium::Text::Prompt::Response::YES)
+        end
+
+        it "should prompt for URLs" do
+          tddium.should_receive(:ask).with(Tddium::Text::Prompt::CI_PULL_URL % current['ci_pull_url'])
+          tddium.should_receive(:ask).with(Tddium::Text::Prompt::CI_PUSH_URL % current['ci_push_url'])
+          run_suite(tddium)
+        end
+
+        it "should prompt for campfire" do
+          tddium.should_receive(:ask).with(Tddium::Text::Prompt::CAMPFIRE_SUBDOMAIN % current['campfire_subdomain'])
+          tddium.should_receive(:ask).with(Tddium::Text::Prompt::CAMPFIRE_TOKEN % current['campfire_token'])
+          tddium.should_receive(:ask).with(Tddium::Text::Prompt::CAMPFIRE_ROOM % current['campfire_room'])
+          run_suite(tddium)
+        end
+      end
+    end
+
     it_should_behave_like "set the default environment"
     it_should_behave_like "sending the api key"
     it_should_behave_like "git repo has not been initialized"
@@ -1497,24 +1519,8 @@ describe Tddium do
               end
             end
 
-            context "enable ci and campfire" do
-              before do
-                tddium.stub(:ask).with(Tddium::Text::Prompt::ENABLE_CI).and_return(Tddium::Text::Prompt::Response::YES)
-                tddium.stub(:ask).with(Tddium::Text::Prompt::ENABLE_CAMPFIRE).and_return(Tddium::Text::Prompt::Response::YES)
-              end
-
-              it "should prompt for URLs" do
-                tddium.should_receive(:ask).with(Tddium::Text::Prompt::CI_PULL_URL)
-                tddium.should_receive(:ask).with(Tddium::Text::Prompt::CI_PUSH_URL)
-                run_suite(tddium)
-              end
-
-              it "should prompt for campfire" do
-                tddium.should_receive(:ask).with(Tddium::Text::Prompt::CAMPFIRE_SUBDOMAIN)
-                tddium.should_receive(:ask).with(Tddium::Text::Prompt::CAMPFIRE_TOKEN)
-                tddium.should_receive(:ask).with(Tddium::Text::Prompt::CAMPFIRE_ROOM)
-                run_suite(tddium)
-              end
+            it_behaves_like "prompting for suite configuration" do
+              let(:current) { {} }
             end
           end
 
@@ -1541,6 +1547,7 @@ describe Tddium do
       context "'GET #{Tddium::Api::Path::SUITES}/#{SAMPLE_SUITE_ID}' is successful" do
         before(:each) do
           stub_call_api_response(:get, "#{Tddium::Api::Path::SUITES}/#{SAMPLE_SUITE_ID}", {"suite"=>SAMPLE_SUITE_RESPONSE})
+          stub_call_api_response(:put, "#{Tddium::Api::Path::SUITES}/#{SAMPLE_SUITE_ID}", {"status"=>0})
         end
 
         it "should not ask for a suite name" do
@@ -1559,6 +1566,24 @@ describe Tddium do
           run_suite(tddium)
         end
 
+        it "should check if the user wants to update the suite" do
+          tddium.should_receive(:ask).with(Tddium::Text::Prompt::UPDATE_SUITE)
+          run_suite(tddium)
+        end
+
+        context "user wants to update the suite" do
+          before(:each) do
+            tddium.stub(:ask).with(Tddium::Text::Prompt::UPDATE_SUITE).and_return(Tddium::Text::Prompt::Response::YES)
+          end
+          it_behaves_like "prompting for suite configuration" do
+            let(:current) { SAMPLE_SUITE_RESPONSE }
+          end
+          it "should PUT to /suites/#{SAMPLE_SUITE_ID}" do
+            call_api_should_receive(:method=>:put, :path=>"#{Tddium::Api::Path::SUITES}/#{SAMPLE_SUITE_ID}")
+            run_suite(tddium)
+          end
+        end
+
         it_should_behave_like "sending the api key"
         it_should_behave_like "an unsuccessful api call"
       end

metadata

@@ -2,7 +2,7 @@
 name: tddium-preview
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.6.6
+  version: 0.6.7
 platform: ruby
 authors: 
 - Solano Labs
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-16 00:00:00 -07:00
+date: 2011-06-17 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency