tddium-preview 0.6.8 → 0.6.10

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tddium-preview (0.6.7)
+    tddium-preview (0.6.9)
       bundler
       highline
       json

data/lib/tddium.rb

@@ -13,7 +13,7 @@ require File.expand_path("../tddium/constant", __FILE__)
 require File.expand_path("../tddium/heroku", __FILE__)
 
 #      Usage:
-#
+
 #      tddium suite    # Register the suite for this rails app, or manage its settings
 #      tddium spec     # Run the test suite
 #      tddium status   # Display information about this suite, and any open dev sessions
@@ -22,7 +22,7 @@ require File.expand_path("../tddium/heroku", __FILE__)
 #      tddium logout   # Log out
 #
 #      tddium account  # View/Manage account information
-#      tddium account:password # Change password
+#      tddium password # Change password
 #
 #      tddium help     # Print this usage message
 
@@ -291,7 +291,7 @@ class Tddium < Thor
     end
   end
 
-  desc "suite", "Register the suite for this project, or manage its settings"
+  desc "suite", "Register the suite for this project, or edit its settings"
   method_option :name, :type => :string, :default => nil
   method_option :pull_url, :type => :string, :default => nil
   method_option :push_url, :type => :string, :default => nil
@@ -435,13 +435,22 @@ class Tddium < Thor
   end
 
   def git_repo?
-    unless File.exists?(".git")
+    unless system("git status --porcelain > /dev/null 2>&1")
       message = Text::Error::GIT_NOT_INITIALIZED
       say message
     end
     message.nil?
   end
 
+  def git_origin_url
+    result = `git config --get remote.origin.url`
+    if $? == 0
+      result
+    else
+      nil
+    end
+  end
+
   def handle_heroku_user(options, heroku_config)
     api_key = heroku_config['TDDIUM_API_KEY']
     user = tddium_client.call_api(:get, Api::Path::USERS, {}, api_key) rescue nil
@@ -481,7 +490,7 @@ class Tddium < Thor
   end
 
   def prompt(text, current_value, default_value)
-    value = current_value || ask(text % default_value)
+    value = current_value || ask(text % default_value, :bold)
     value.empty? ? default_value : value
   end
 
@@ -501,22 +510,26 @@ class Tddium < Thor
       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
+    ask_or_update.call(:test_pattern, Text::Prompt::TEST_PATTERN, Default::SUITE_TEST_PATTERN)
+
+    if current.size > 0 && current['ci_pull_url']
+      say(Text::Process::SETUP_CI_EDIT)
+    else
+      say(Text::Process::SETUP_CI_FIRST_TIME % params[:test_pattern])
     end
 
-    ask_or_update.call(:test_pattern, Text::Prompt::TEST_PATTERN, Default::SUITE_TEST_PATTERN)
+    ask_or_update.call(:ci_pull_url, Text::Prompt::CI_PULL_URL, git_origin_url) 
+    ask_or_update.call(:ci_push_url, Text::Prompt::CI_PUSH_URL, nil)
 
-    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
+    if current.size > 0 && current['campfire_room']
+      say(Text::Process::SETUP_CAMPFIRE_EDIT)
+    else
+      say(Text::Process::SETUP_CAMPFIRE_FIRST_TIME)
     end
+
+    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
 
   def prompt_update_suite(suite, options)

data/lib/tddium/constant.rb

@@ -46,6 +46,7 @@ module TddiumConstant
       module Response
         AGREE_TO_LICENSE = "I AGREE"
         YES = "y"
+        DISABLE = 'disable'
       end
       SSH_KEY = "Enter your ssh key or press 'Return'. Using '%s' by default:"
       SUITE_NAME = "Enter a suite name or press 'Return'. Using '%s' by default:"
@@ -58,11 +59,9 @@ module TddiumConstant
       INVITATION_TOKEN = "Enter your invitation token:"
       USE_EXISTING_SUITE = "A suite exists '%%s' (branch %s). Enter '#{Response::YES}' to use it, or enter a new repo name:"
       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 (default '%s'):"
-      CI_PUSH_URL = "Push to git URL on tests pass (unset=disable) (default '%s'):"
-      ENABLE_CAMPFIRE = "Setup Campfire CI notifications?"
+      UPDATE_SUITE = "Do you want to edit settings for this suite? (y/n)"
+      CI_PULL_URL = "Enter git URL to pull from (default '%s'):"
+      CI_PUSH_URL = "Enter git URL to push to (default '%s'):"
       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'):"
@@ -115,6 +114,54 @@ with Tddium.
 "
       UPDATED_SUITE = "Updated suite successfully."
       DEPENDENCY_VERSION = "Detected %s %s"
+      SETUP_CI_FIRST_TIME =<<EOF;
+
+Tddium Hosted CI will wait for a POST from a git post-receive hook.
+
+When the hook runs, Tddium will:
+
+1) Pull your integration branch from your git server (pull from URL)
+2) Run all the tests that match the test pattern for this suite:
+      %s
+3) Notify you by email and/or campfire
+4) If you want, when tests pass, Tddium CI will then push to a git
+   server (push to URL).  For example, enter the git URL to your
+   Heroku staging app.
+
+Enter a git URL to pull from to enable hosted CI.
+
+When everything's been set up, you'll receive an SSH public key to authorize in
+git for pulls and pushes, and a Hook URL to configure in a post-commit hook.
+
+Leave both the pull and push URL settings blank to disable hosted CI.
+EOF
+      SETUP_CAMPFIRE_FIRST_TIME =<<EOF;
+
+To enable Campfire notifications, enter your Campfire subdomain, API token, 
+and the room name to post for this suite's builds.
+
+Subdomain and API token are shared by all suites that belong to you (%s).
+
+Leave the Campfire room name blank to disable Campfire for this suite.
+
+EOF
+
+      SETUP_CI_EDIT =<<EOF;
+
+Tddium Hosted CI is enabled for this suite.
+
+Set the "git URL to pull from" to 'disable' to disable CI completely.
+Set the "git URL to push to" to 'disable' to disable CI completely.
+
+EOF
+      SETUP_CAMPFIRE_EDIT =<<EOF;
+
+Campfire notifications are enabled for this suite.
+Subdomain and API token are shared by all suites that belong to you (%s).
+
+Set the "Campfire room name" to 'disable' to disable Campfire notifications
+for this suite.
+EOF
     end
 
     module Status
@@ -174,6 +221,8 @@ Authorize the following SSH key to let Tddium's pulls and pushes through:
 To trigger CI builds, POST to the following URL from a post-commit hook:
 
 <%=suite["hook_uri"]%>
+
+See www.tddium.com/support for more information.
 <% end %>
 EOF
     end

data/lib/tddium/version.rb

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

data/spec/tddium_spec.rb

@@ -174,6 +174,8 @@ describe Tddium do
     tddium.stub(:say)
     stub_git_branch(tddium)
     stub_tddium_client
+    stub_git_status(tddium)
+    stub_git_config(tddium)
     create_file(File.join(".git", "something"), "something")
     create_file(Tddium::Git::GITIGNORE, "something")
   end
@@ -182,6 +184,14 @@ describe Tddium do
     tddium.stub(:`).with("git symbolic-ref HEAD").and_return(default_branch_name)
   end
 
+  def stub_git_status(tddium, result=true)
+    tddium.stub(:system).with(/git status/).and_return(result)
+  end
+
+  def stub_git_config(tddium)
+    tddium.stub(:`).with(/git config/).and_return(SAMPLE_GIT_REPO_URI)
+  end
+
   def stub_git_push(tddium, success = true)
     tddium.stub(:system).with(/^git push/).and_return(success)
   end
@@ -247,6 +257,7 @@ describe Tddium do
     context "git repo has not been initialized" do
       before do
         FileUtils.rm_rf(".git")
+        stub_git_status(tddium, false)
       end
 
       it "should return git is uninitialized" do
@@ -492,14 +503,14 @@ describe Tddium do
   shared_examples_for "prompt for ssh key" do
     context "--ssh-key-file is not supplied" do
       it "should prompt the user for their ssh key file" do
-        tddium.should_receive(:ask).with(Tddium::Text::Prompt::SSH_KEY % Tddium::Default::SSH_FILE)
+        tddium.should_receive(:ask).with(Tddium::Text::Prompt::SSH_KEY % Tddium::Default::SSH_FILE, anything)
         run(tddium)
       end
     end
 
     context "--ssh-key-file is supplied" do
       it "should not prompt the user for their ssh key file" do
-        tddium.should_not_receive(:ask).with(Tddium::Text::Prompt::SSH_KEY % Tddium::Default::SSH_FILE)
+        tddium.should_not_receive(:ask).with(Tddium::Text::Prompt::SSH_KEY % Tddium::Default::SSH_FILE, anything)
         run(tddium, :ssh_key_file => Tddium::Default::SSH_FILE)
       end
     end
@@ -1327,24 +1338,17 @@ describe Tddium do
     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 URLs" do
+        tddium.should_receive(:ask).with(Tddium::Text::Prompt::CI_PULL_URL % current.fetch('ci_pull_url', SAMPLE_GIT_REPO_URI), anything)
+        tddium.should_receive(:ask).with(Tddium::Text::Prompt::CI_PUSH_URL % current['ci_push_url'], anything)
+        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
+      it "should prompt for campfire" do
+        tddium.should_receive(:ask).with(Tddium::Text::Prompt::CAMPFIRE_SUBDOMAIN % current['campfire_subdomain'], anything)
+        tddium.should_receive(:ask).with(Tddium::Text::Prompt::CAMPFIRE_TOKEN % current['campfire_token'], anything)
+        tddium.should_receive(:ask).with(Tddium::Text::Prompt::CAMPFIRE_ROOM % current['campfire_room'], anything)
+        run_suite(tddium)
       end
     end
 
@@ -1381,10 +1385,10 @@ describe Tddium do
       end
 
       context "interactive mode" do
-        before { tddium.stub(:ask).with(Tddium::Text::Prompt::SUITE_NAME % SAMPLE_APP_NAME).and_return("some_other_suite") }
+        before { tddium.stub(:ask).with(Tddium::Text::Prompt::SUITE_NAME % SAMPLE_APP_NAME, anything).and_return("some_other_suite") }
 
         it "should ask for a suite name" do
-          tddium.should_receive(:ask).with(Tddium::Text::Prompt::SUITE_NAME % SAMPLE_APP_NAME)
+          tddium.should_receive(:ask).with(Tddium::Text::Prompt::SUITE_NAME % SAMPLE_APP_NAME, anything)
           run_suite(tddium)
         end
 
@@ -1404,7 +1408,7 @@ describe Tddium do
       context "but this user has already registered some suites" do
         before do
           stub_call_api_response(:get, Tddium::Api::Path::SUITES, SAMPLE_SUITES_RESPONSE, {"suites" => []})
-          tddium.stub(:ask).with(Tddium::Text::Prompt::USE_EXISTING_SUITE % SAMPLE_BRANCH_NAME % SAMPLE_APP_NAME).and_return(Tddium::Text::Prompt::Response::YES)
+          tddium.stub(:ask).with(Tddium::Text::Prompt::USE_EXISTING_SUITE % SAMPLE_BRANCH_NAME % SAMPLE_APP_NAME, anything).and_return(Tddium::Text::Prompt::Response::YES)
         end
 
         shared_examples_for "writing the suite to file" do
@@ -1431,7 +1435,7 @@ describe Tddium do
 
         context "passing no cli options" do
           it "should ask the user: '#{Tddium::Text::Prompt::USE_EXISTING_SUITE % SAMPLE_BRANCH_NAME % SAMPLE_APP_NAME}' " do
-            tddium.should_receive(:ask).with(Tddium::Text::Prompt::USE_EXISTING_SUITE % SAMPLE_BRANCH_NAME % SAMPLE_APP_NAME).and_return("something")
+            tddium.should_receive(:ask).with(Tddium::Text::Prompt::USE_EXISTING_SUITE % SAMPLE_BRANCH_NAME % SAMPLE_APP_NAME, anything).and_return("something")
             run_suite(tddium)
           end
         end
@@ -1442,7 +1446,7 @@ describe Tddium do
           end
 
           it "should not ask the user if they want to use the existing suite" do
-            tddium_client.should_not_receive(:ask).with(Tddium::Text::Prompt::USE_EXISTING_SUITE % "my_suite")
+            tddium_client.should_not_receive(:ask).with(Tddium::Text::Prompt::USE_EXISTING_SUITE % "my_suite", anything)
             run_suite(tddium, :name => "my_suite")
           end
 
@@ -1474,7 +1478,7 @@ describe Tddium do
         end
 
         context "the user does not want to use the existing suite" do
-          before{ tddium.stub(:ask).with(Tddium::Text::Prompt::USE_EXISTING_SUITE % SAMPLE_BRANCH_NAME % SAMPLE_APP_NAME).and_return("some_other_suite") }
+          before{ tddium.stub(:ask).with(Tddium::Text::Prompt::USE_EXISTING_SUITE % SAMPLE_BRANCH_NAME % SAMPLE_APP_NAME, anything).and_return("some_other_suite") }
 
 
           it "should send a 'POST' request to '#{Tddium::Api::Path::SUITES}'" do
@@ -1508,8 +1512,8 @@ describe Tddium do
 
           context "interactive mode" do
             before do
-              tddium.stub(:ask).with(Tddium::Text::Prompt::USE_EXISTING_SUITE % SAMPLE_BRANCH_NAME % SAMPLE_APP_NAME).and_return("foobar")
-              tddium.stub(:ask).with(Tddium::Text::Prompt::TEST_PATTERN % Tddium::Default::SUITE_TEST_PATTERN).and_return(SAMPLE_SUITE_PATTERN)
+              tddium.stub(:ask).with(Tddium::Text::Prompt::USE_EXISTING_SUITE % SAMPLE_BRANCH_NAME % SAMPLE_APP_NAME, anything).and_return("foobar")
+              tddium.stub(:ask).with(Tddium::Text::Prompt::TEST_PATTERN % Tddium::Default::SUITE_TEST_PATTERN, anything).and_return(SAMPLE_SUITE_PATTERN)
               stub_default_suite_name
             end
 
@@ -1569,13 +1573,13 @@ describe Tddium do
         end
 
         it "should check if the user wants to update the suite" do
-          tddium.should_receive(:ask).with(Tddium::Text::Prompt::UPDATE_SUITE)
+          tddium.should_receive(:ask).with(Tddium::Text::Prompt::UPDATE_SUITE, anything)
           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)
+            tddium.stub(:ask).with(Tddium::Text::Prompt::UPDATE_SUITE, anything).and_return(Tddium::Text::Prompt::Response::YES)
           end
           it_behaves_like "prompting for suite configuration" do
             let(:current) { SAMPLE_SUITE_RESPONSE }

metadata

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