tddium-preview 0.5.6 → 0.6.0

data/.gitignore

@@ -49,3 +49,5 @@ nbproject
 #
 # For vim:
 *.swp
+*.swo
+.tddium.staging

data/Gemfile.lock

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

data/lib/tddium/constant.rb

@@ -13,6 +13,7 @@ module TddiumConstant
     ENVIRONMENT = "production"
     SSH_FILE = "~/.ssh/id_rsa.pub"
     TEST_PATTERN = "spec/**/*_spec.rb"
+    SUITE_TEST_PATTERN = "features/*.feature, spec/**/*_spec.rb, test/**/test_*.rb"
   end
 
   module Git
@@ -57,6 +58,15 @@ module TddiumConstant
       PASSWORD_CONFIRMATION = "Confirm your password: "
       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 = "Default test pattern: "
+      ENABLE_CI = "Do you want to configure Hosted Continuous Integration?"
+      UPDATE_SUITE = "Do you want to edit settings for this suite?"
+      CI_PULL_URL = "git URL to pull from:"
+      CI_PUSH_URL = "git URL to push on passing tests (blank to disable):"
+      ENABLE_CAMPFIRE = "Setup Campfire CI notifications?"
+      CAMPFIRE_SUBDOMAIN = "Campfire Subdomain:"
+      CAMPFIRE_ROOM = "Campfire Room:"
+      CAMPFIRE_TOKEN = "Campfire API Token:"
     end
 
     module Process
@@ -67,8 +77,9 @@ module TddiumConstant
       CHECK_TEST_STATUS = "Use 'tddium status' to check on pending jobs"
       FINISHED_TEST = "Finished in %s seconds"
       CHECK_TEST_REPORT = "Test report: %s"
-      EXISTING_SUITE = "Current suite: %s"
-      CREATING_SUITE = "Creating suite '%s'.  This will take a few seconds."
+      EXISTING_SUITE = "Current suite...\n\n%s"
+      CREATING_SUITE = "Creating suite '%s/%s'.  This will take a few seconds."
+      CREATED_SUITE = "Created suite...\n\n%s"
       PASSWORD_CONFIRMATION_INCORRECT = "Password confirmation incorrect"
       PASSWORD_CHANGED = "Your password has been changed."
       ACCOUNT_CREATED = "
@@ -116,7 +127,15 @@ with Tddium.
       SESSION_TITLE = "  Session %s:"
       ATTRIBUTE_DETAIL = "    %s: %s"
       SEPARATOR = "====="
-      USING_SUITE = "Using suite: '%s' on branch: '%s'"
+      USING_SUITE = "Using suite...\n\n%s"
+      USER_DETAILS =<<EOF;
+Username: <%=user["email"]%>
+Account Created: <%=user["created_at"]%>
+Recurly Management URL: <%=user["recurly_url"]%>
+<% if user["heroku"] %>
+Heroku Account Linked: <%=user["heroku_activation_done"]%>
+<% end %>
+EOF
       HEROKU_CONFIG = "
 Tddium is configured to work with your Heroku app.
 
@@ -131,6 +150,27 @@ $ tddium suite
 $ tddium spec
 
 "
+      SUITE_DETAILS =<<EOF;
+Repo: <%=suite["repo_name"]%>/<%=suite["branch"]%>
+Default Test Pattern: <%=suite["test_pattern"]%>
+<% if suite["ci_pull_url"] %>
+Tddium Hosted CI is enabled with the following parameters:
+
+Pull URL: <%=suite["ci_pull_url"]%>
+Push URL: <%=suite["ci_push_url"]%>
+
+Notifications:
+<%=suite["ci_notifications"]%>
+
+Authorize the following SSH key to let Tddium's pulls and pushes through:
+
+<%=suite["ci_ssh_pubkey"]%>
+
+To trigger CI builds, POST to the following URL from a post-commit hook:
+
+<%=suite["hook_uri"]%>
+<% end %>
+EOF
     end
 
     module Error

data/lib/tddium/version.rb

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

data/lib/tddium.rb

@@ -8,6 +8,7 @@ require "highline/import"
 require "json"
 require "tddium_client"
 require "base64"
+require 'erb'
 require File.expand_path("../tddium/constant", __FILE__)
 require File.expand_path("../tddium/heroku", __FILE__)
 
@@ -297,6 +298,9 @@ class Tddium < Thor
 
   desc "suite", "Register the suite for this project, or manage 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
+  method_option :test_pattern, :type => :string, :default => nil
   method_option :environment, :type => :string, :default => nil
   def suite
     set_default_environment(options[:environment])
@@ -307,45 +311,20 @@ class Tddium < Thor
       if current_suite_id
         current_suite = call_api(:get, current_suite_path)["suite"]
 
-        say Text::Process::EXISTING_SUITE % "#{current_suite["repo_name"]}/#{current_suite["branch"]}"
+        say Text::Process::EXISTING_SUITE % format_suite_details(current_suite)
+        #prompt_update_suite(current_suite, options)
       else
         params[:branch] = current_git_branch
         default_suite_name = File.basename(Dir.pwd)
         params[:repo_name] = options[:name] || default_suite_name
 
-        existing_suite = nil
-        use_existing_suite = false
-        suite_name_resolved = false
-        while !suite_name_resolved
-          # Check to see if there is an existing suite
-          current_suites = call_api(:get, Api::Path::SUITES, params)
-          existing_suite = current_suites["suites"].first
-
-          # Get the suite name
-          current_suite_name = params[:repo_name]
-          if existing_suite
-            # Prompt for using existing suite (unless suite name is passed from command line) or entering new one
-            params[:repo_name] = prompt(Text::Prompt::USE_EXISTING_SUITE % params[:branch], options[:name], current_suite_name)
-            if options[:name] || params[:repo_name] == Text::Prompt::Response::YES
-              # Use the existing suite, so assign the value back and exit the loop
-              params[:repo_name] = current_suite_name
-              use_existing_suite = true
-              suite_name_resolved = true
-            end
-          elsif current_suite_name == default_suite_name
-            # Prompt for using default suite name or entering new one
-            params[:repo_name] = prompt(Text::Prompt::SUITE_NAME, options[:name], current_suite_name)
-            suite_name_resolved = true if params[:repo_name] == default_suite_name
-          else
-            # Suite name does not exist yet and already prompted
-            suite_name_resolved = true
-          end
-        end
+        use_existing_suite, existing_suite = resolve_suite_name(options, params, default_suite_name)
 
         if use_existing_suite
           # Write to file and exit when using the existing suite
           write_suite(existing_suite["id"])
-          say Text::Status::USING_SUITE % [existing_suite["repo_name"], existing_suite["branch"]]
+          say Text::Status::USING_SUITE % format_suite_details(existing_suite)
+          #prompt_update_suite(existing_suite, options)
           return
         end
 
@@ -353,17 +332,21 @@ class Tddium < Thor
         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
-        say Text::Process::CREATING_SUITE % params[:repo_name]
+        say Text::Process::CREATING_SUITE % [params[:repo_name], params[:branch]]
         new_suite = call_api(:post, Api::Path::SUITES, {:suite => params})
         # Save the created suite
         write_suite(new_suite["suite"]["id"])
 
         # Manage git
         update_git_remote_and_push(new_suite)
+
+        say Text::Process::CREATED_SUITE % format_suite_details(new_suite["suite"])
       end
     rescue TddiumClient::Error::Base
+      exit_failure
     end
   end
 
@@ -517,6 +500,55 @@ 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)
+      end
+    end
+  end
+
+  def prompt_update_suite(api_response, options)
+    say Text::Prompt::UPDATE_SUITE
+  end
+
+  def resolve_suite_name(options, params, default_suite_name)
+    # XXX updates params
+    existing_suite = nil
+    use_existing_suite = false
+    suite_name_resolved = false
+    while !suite_name_resolved
+      # Check to see if there is an existing suite
+      current_suites = call_api(:get, Api::Path::SUITES, params)
+      existing_suite = current_suites["suites"].first
+
+      # Get the suite name
+      current_suite_name = params[:repo_name]
+      if existing_suite
+        # Prompt for using existing suite (unless suite name is passed from command line) or entering new one
+        params[:repo_name] = prompt(Text::Prompt::USE_EXISTING_SUITE % params[:branch], options[:name], current_suite_name)
+        if options[:name] || params[:repo_name] == Text::Prompt::Response::YES
+          # Use the existing suite, so assign the value back and exit the loop
+          params[:repo_name] = current_suite_name
+          use_existing_suite = true
+          suite_name_resolved = true
+        end
+      elsif current_suite_name == default_suite_name
+        # Prompt for using default suite name or entering new one
+        params[:repo_name] = prompt(Text::Prompt::SUITE_NAME, options[:name], current_suite_name)
+        suite_name_resolved = true if params[:repo_name] == default_suite_name
+      else
+        # Suite name does not exist yet and already prompted
+        suite_name_resolved = true
+      end
+    end
+    [use_existing_suite, existing_suite]
+  end
 
   def set_default_environment(env)
     if env.nil?
@@ -549,15 +581,15 @@ class Tddium < Thor
     # Given the user is logged in, she should be able to use "tddium account" to display information about her account:
     # Email address
     # Account creation date
-    say "Username: "+api_response["user"]["email"]
-    say "Account Created: " + api_response["user"]["created_at"]
-    say "Recurly Management URL: " + api_response["user"]["recurly_url"]
-    say "CI Public Key: " + api_response["user"]["ci_ssh_pubkey"] if api_response["user"]["ci_ssh_pubkey"]
-    say "Suites: " + api_response["user"]["suites"] if api_response["user"]["suites"]
-    say "Heroku Account Linked: #{api_response["user"]["heroku_activation_done"]}" if api_response["user"]["heroku"]
+    user = api_response["user"]
+    say ERB.new(Text::Status::USER_DETAILS).result(binding)
   end
 
-  def show_ci_info(api_response)
+  def format_suite_details(suite)
+    # Given an API response containing a "suite" key, compose a string with
+    # important information about the suite
+    details = ERB.new(Text::Status::SUITE_DETAILS).result(binding)
+    details
   end
 
   def suite_for_current_branch?

data/spec/tddium_spec.rb

@@ -33,9 +33,16 @@ describe Tddium do
   SAMPLE_SUITE_ID = 1
   SAMPLE_USER_ID = 1
   DEFAULT_TEST_PATTERN = Tddium::Default::TEST_PATTERN
+  SAMPLE_SUITE_PATTERN = "features/*.feature, spec/**/*_spec.rb"
   CUSTOM_TEST_PATTERN = "**/cat_spec.rb"
-  SAMPLE_SUITE_RESPONSE = {"repo_name" => SAMPLE_APP_NAME, "branch" => SAMPLE_BRANCH_NAME, "id" => SAMPLE_SUITE_ID, "ruby_version"=>SAMPLE_RUBY_VERSION, "git_repo_uri" => SAMPLE_GIT_REPO_URI}
+  SAMPLE_SUITE_RESPONSE = {"repo_name" => SAMPLE_APP_NAME,
+                           "branch" => SAMPLE_BRANCH_NAME, 
+                           "id" => SAMPLE_SUITE_ID, 
+                           "ruby_version"=>SAMPLE_RUBY_VERSION,
+                           "git_repo_uri" => SAMPLE_GIT_REPO_URI,
+                           "test_pattern" => SAMPLE_SUITE_PATTERN}
   SAMPLE_SUITES_RESPONSE = {"suites" => [SAMPLE_SUITE_RESPONSE]}
+  SAMPLE_SUITE_OUTPUT = "Repo: #{SAMPLE_APP_NAME}/#{SAMPLE_BRANCH_NAME}\nDefault Test Pattern: #{SAMPLE_SUITE_PATTERN}\n\n"
   SAMPLE_TDDIUM_CONFIG_FILE = ".tddium.test"
   SAMPLE_TEST_EXECUTION_STATS = "total 1, notstarted 0, started 1, passed 0, failed 0, pending 0, error 0", "start_time"
   SAMPLE_USER_RESPONSE = {"status"=>0, "user"=>
@@ -1439,8 +1446,8 @@ describe Tddium do
 
           it_should_behave_like "writing the suite to file"
 
-          it "should show the user: '#{Tddium::Text::Status::USING_SUITE % [SAMPLE_APP_NAME, SAMPLE_BRANCH_NAME]}'" do
-            tddium.should_receive(:say).with(Tddium::Text::Status::USING_SUITE % [SAMPLE_APP_NAME, SAMPLE_BRANCH_NAME])
+          it "should show the user: '#{Tddium::Text::Status::USING_SUITE % SAMPLE_SUITE_OUTPUT}'" do
+            tddium.should_receive(:say).with(Tddium::Text::Status::USING_SUITE % SAMPLE_SUITE_OUTPUT)
             run_suite(tddium)
           end
         end
@@ -1481,13 +1488,36 @@ 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).and_return(SAMPLE_SUITE_PATTERN)
               stub_default_suite_name
             end
 
-            it "should POST the user's entered values to the API" do
-              tddium.should_receive(:say).with(Tddium::Text::Process::CREATING_SUITE % "foobar")
-              call_api_should_receive(:method => :post, :params => {:suite => hash_including(:repo_name => "foobar")})
-              run_suite(tddium)
+            context "no ci url" do
+              it "should POST the user's entered values to the API" do
+                tddium.should_receive(:say).with(Tddium::Text::Process::CREATING_SUITE % ["foobar", SAMPLE_BRANCH_NAME])
+                call_api_should_receive(:method => :post, :params => {:suite => hash_including(:repo_name => "foobar", :test_pattern=>SAMPLE_SUITE_PATTERN)})
+                run_suite(tddium)
+              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
             end
           end
 
@@ -1513,14 +1543,7 @@ describe Tddium do
 
       context "'GET #{Tddium::Api::Path::SUITES}/#{SAMPLE_SUITE_ID}' is successful" do
         before(:each) do
-          response = {
-            "suite" => {
-              "id" => SAMPLE_SUITE_ID,
-              "repo_name" => SAMPLE_APP_NAME,
-              "branch" => SAMPLE_BRANCH_NAME
-            }
-          }
-          stub_call_api_response(:get, "#{Tddium::Api::Path::SUITES}/#{SAMPLE_SUITE_ID}", response)
+          stub_call_api_response(:get, "#{Tddium::Api::Path::SUITES}/#{SAMPLE_SUITE_ID}", {"suite"=>SAMPLE_SUITE_RESPONSE})
         end
 
         it "should not ask for a suite name" do
@@ -1535,7 +1558,7 @@ describe Tddium do
         end
 
         it "should display '#{Tddium::Text::Process::EXISTING_SUITE}'" do
-          tddium.should_receive(:say).with(Tddium::Text::Process::EXISTING_SUITE % "#{SAMPLE_APP_NAME}/#{SAMPLE_BRANCH_NAME}")
+          tddium.should_receive(:say).with(Tddium::Text::Process::EXISTING_SUITE % SAMPLE_SUITE_OUTPUT)
           run_suite(tddium)
         end
 

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: tddium-preview
 version: !ruby/object:Gem::Version 
-  hash: 7
   prerelease: 
-  segments: 
-  - 0
-  - 5
-  - 6
-  version: 0.5.6
+  version: 0.6.0
 platform: ruby
 authors: 
 - Solano Labs
@@ -15,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-14 00:00:00 -07:00
+date: 2011-06-15 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,9 +21,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id001
@@ -40,9 +32,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id002
@@ -54,9 +43,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id003
@@ -68,11 +54,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 0
-        - 0
-        - 6
         version: 0.0.6
   type: :runtime
   version_requirements: *id004
@@ -84,9 +65,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id005
@@ -98,9 +76,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id006
@@ -112,9 +87,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id007
@@ -126,9 +98,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id008
@@ -140,9 +109,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id009
@@ -192,18 +158,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []