tddium-preview 0.6.10 → 0.6.11

data/Gemfile.lock

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

data/lib/tddium.rb

@@ -445,7 +445,7 @@ class Tddium < Thor
   def git_origin_url
     result = `git config --get remote.origin.url`
     if $? == 0
-      result
+      result.strip
     else
       nil
     end
@@ -502,6 +502,7 @@ class Tddium < Thor
   end
 
   def prompt_suite_params(options, params, current={})
+    say Text::Process::DETECTED_BRANCH % params[:branch] if params[:branch]
     params[:ruby_version] = dependency_version(:ruby)
     params[:bundler_version] = dependency_version(:bundle)
     params[:rubygems_version] = dependency_version(:gem)

data/lib/tddium/constant.rb

@@ -49,7 +49,7 @@ module TddiumConstant
         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:"
+      SUITE_NAME = "Enter a repo name or press 'Return'. Using '%s' by default:"
       LICENSE_AGREEMENT = "Type '%s' to accept the license and continue:" % Response::AGREE_TO_LICENSE
       EMAIL = "Enter your email address:"
       CURRENT_PASSWORD = "Enter your old password: "
@@ -114,26 +114,25 @@ with Tddium.
 "
       UPDATED_SUITE = "Updated suite successfully."
       DEPENDENCY_VERSION = "Detected %s %s"
+      DETECTED_BRANCH = "Detected branch %s"
       SETUP_CI_FIRST_TIME =<<EOF;
 
-Tddium Hosted CI will wait for a POST from a git post-receive hook.
+Tddium includes a Hosted Continuous Integration service that will run a
+CI build when it's triggered by a POST:
 
-When the hook runs, Tddium will:
+1. Pull from your git server
+2. Run tests that match the test pattern for this suite:  %s
+3. Notify you by email and/or campfire
+4. Optionally, Tddium CI will then push to a git server (push to URL).  For
+   example, enter the git URL to your Heroku staging app.
 
-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.
+>>> Leave both the pull and push URL settings blank to disable 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.
+>>> To enable Hosted CI, enter a git URL to pull from.
+
 EOF
       SETUP_CAMPFIRE_FIRST_TIME =<<EOF;
 

data/lib/tddium/version.rb

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

metadata

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