tddium-preview 0.6.19 → 0.7.0

data/Gemfile.lock

@@ -1,11 +1,11 @@
 PATH
   remote: .
   specs:
-    tddium-preview (0.6.19)
+    tddium-preview (0.7.0)
       bundler
       highline
       json
-      tddium_client (>= 0.0.6)
+      tddium_client (>= 0.0.8)
       thor
 
 GEM

data/lib/tddium.rb

@@ -442,7 +442,7 @@ class Tddium < Thor
   end
 
   def dependency_version(command)
-    result = `#{command} -v`.match(Dependency::VERSION_REGEXP)[1]
+    result = `#{command} -v`.strip
     say Text::Process::DEPENDENCY_VERSION % [command, result]
     result
   end
@@ -516,8 +516,9 @@ class Tddium < Thor
   end
 
   def git_origin_url
-    result = `git config --get remote.origin.url`
-    if $? == 0 && result =~ /@/
+    result = `(git config --get remote.origin.url || echo GIT_FAILED) 2>/dev/null`
+    return nil if result =~ /GIT_FAILED/
+    if result =~ /@/
       result.strip
     else
       nil

data/lib/tddium/constant.rb

@@ -59,9 +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:"
-      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'):"
+      CI_PULL_URL = "Enter git URL to pull from (default '%s') or enter 'disable':"
+      CI_PUSH_URL = "Enter git URL to push to (default '%s') or enter 'disable':"
+      CAMPFIRE_SUBDOMAIN = "Enter your Campfire subdomain (default '%s') or enter 'disable':"
       CAMPFIRE_ROOM = "Enter the Campfire room name (default '%s'):"
       CAMPFIRE_TOKEN = "Enter your Campfire API Token (default '%s'):"
     end
@@ -131,14 +131,13 @@ CI build when it's triggered by a POST:
 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.
 
->>> Set both pull and push URLs to 'disable' to disable hosted CI completely.
-
 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.
 
 Tddium CI will not start builds on its own.
 
 >>> To set up Hosted CI, enter a git URL to pull from.
+>>> Set both pull and push URLs to 'disable' to disable hosted CI completely.
 
 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.19"
+  VERSION = "0.7.0"
 end

data/spec/tddium_spec.rb

@@ -14,7 +14,7 @@ describe Tddium do
   SAMPLE_API_KEY = "afb12412bdafe124124asfasfabebafeabwbawf1312342erbfasbb"
   SAMPLE_APP_NAME = "tddelicious"
   SAMPLE_BRANCH_NAME = "test"
-  SAMPLE_BUNDLER_VERSION = "1.10.10"
+  SAMPLE_BUNDLER_VERSION = "Bundler version 1.10.10"
   SAMPLE_DATE_TIME = "2011-03-11T08:43:02Z"
   SAMPLE_EMAIL = "someone@example.com"
   SAMPLE_FILE_PATH = "./my_user_file.png"
@@ -27,7 +27,7 @@ describe Tddium do
   SAMPLE_NEW_PASSWORD = "foobar2"
   SAMPLE_REPORT_URL = "http://api.tddium.com/1/sessions/1/test_executions/report"
   SAMPLE_RUBYGEMS_VERSION = "1.3.7"
-  SAMPLE_RUBY_VERSION = "1.8.7"
+  SAMPLE_RUBY_VERSION = "ruby 1.8.7 (2010-08-16 patchlevel 302) [i686-darwin10.5.0]"
   SAMPLE_RECURLY_URL = "https://tddium.recurly.com/account/1"
   SAMPLE_SESSION_ID = 1
   SAMPLE_SUITE_ID = 1
@@ -118,8 +118,8 @@ describe Tddium do
     end
   end
 
-  def stub_bundler_version(tddium, version = SAMPLE_BUNDLER_VERSION)
-    tddium.stub(:`).with("bundle -v").and_return("Bundler version #{version}")
+  def stub_bundler_version(tddium)
+    tddium.stub(:`).with("bundle -v").and_return(SAMPLE_BUNDLER_VERSION)
   end
 
   def stub_call_api_response(method, path, *response)
@@ -202,7 +202,7 @@ describe Tddium do
   end
 
   def stub_git_config(tddium)
-    tddium.stub(:`).with("git config --get remote.origin.url").and_return(SAMPLE_GIT_REPO_URI)
+    tddium.stub(:`).with(/^\(git config --get remote.origin.url/).and_return(SAMPLE_GIT_REPO_URI)
   end
 
   def stub_git_push(tddium, success = true)
@@ -214,8 +214,8 @@ describe Tddium do
     tddium.stub(:`).with(/^git remote #{action}/).and_return(git_response)
   end
 
-  def stub_ruby_version(tddium, version = SAMPLE_RUBY_VERSION)
-    tddium.stub(:`).with("ruby -v").and_return("ruby #{version} (2010-08-16 patchlevel 302) [i686-darwin10.5.0]")
+  def stub_ruby_version(tddium)
+    tddium.stub(:`).with("ruby -v").and_return(SAMPLE_RUBY_VERSION)
   end
 
   def stub_rubygems_version(tddium, version = SAMPLE_RUBYGEMS_VERSION)

data/tddium.gemspec

@@ -35,7 +35,7 @@ EOF
   s.add_runtime_dependency("thor")
   s.add_runtime_dependency("highline")
   s.add_runtime_dependency("json")
-  s.add_runtime_dependency("tddium_client", ">=0.0.6")
+  s.add_runtime_dependency("tddium_client", ">=0.0.8")
   s.add_runtime_dependency("bundler")
 
   s.add_development_dependency("rspec")

metadata

@@ -2,7 +2,7 @@
 name: tddium-preview
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.6.19
+  version: 0.7.0
 platform: ruby
 authors: 
 - Solano Labs
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-07 00:00:00 -07:00
+date: 2011-07-10 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -54,7 +54,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.0.6
+        version: 0.0.8
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency