tddium-preview 0.6.14 → 0.6.15

data/lib/tddium/constant.rb

@@ -67,6 +67,10 @@ module TddiumConstant
       CAMPFIRE_TOKEN = "Enter your Campfire API Token (default '%s'):"
     end
 
+    module Warning
+      GIT_CHANGES_NOT_COMMITTED = "Uncommitted changes in local git repository"
+    end
+
     module Process
       TERMINATE_INSTRUCTION = "Press Ctrl-C to stop waiting.  Tests will continue running."
       INTERRUPT = "Interrupted"
@@ -231,7 +235,23 @@ EOF
     module Error
       NOT_INITIALIZED = "tddium must be initialized. Try 'tddium login'"
       INVALID_TDDIUM_FILE = ".tddium.%s config file is corrupt. Try 'tddium login'"
-      GIT_NOT_INITIALIZED = "git repo must be initialized. Try 'git init'"
+      GIT_NOT_INITIALIZED =<<EOF;
+It doesn't look like you're in a git repo.  If you're not, use 'git init' to
+create one.
+
+If you are in a git repo and you're still seeing this message,
+you may be using an unsupported version of git.
+
+Please email us at info@tddium.com with the following trace information:
+
+>>>>>>>>>>>>> BEGIN GIT TRACE >>>>>>>>>>>>>>>>>>>>>>>>>
+git version: #{`git --version 2>&1`}
+git status:  #{`git status 2>&1`}
+git status result: #{ $? }
+git details: #{`git status --porcelain 2>&1`}
+git details result: #{ $? }
+>>>>>>>>>>>>> END GIT TRACE   >>>>>>>>>>>>>>>>>>>>>>>>>
+EOF
       NO_SUITE_EXISTS = "No suite exists for the branch '%s'. Try running 'tddium suite'"
       INVALID_INVITATION = "
 Your invitation token wasn't recognized. If you have a token, make sure you enter it correctly.

data/lib/tddium/version.rb

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

data/lib/tddium.rb

@@ -14,7 +14,6 @@ require File.expand_path("../tddium/version", __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
@@ -29,7 +28,7 @@ require File.expand_path("../tddium/heroku", __FILE__)
 
 class Tddium < Thor
   include TddiumConstant
-  
+
   desc "account", "View/Manage account information"
   method_option :environment, :type => :string, :default => nil
   method_option :email, :type => :string, :default => nil
@@ -383,7 +382,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
@@ -398,6 +397,10 @@ class Tddium < Thor
     tddium_client.environment.to_sym
   end
 
+  def warn(msg='')
+    STDERR.puts("WARNING: #{msg}")
+  end
+
   def exit_failure(msg='')
     abort msg
   end
@@ -423,7 +426,6 @@ class Tddium < Thor
     result
   end
 
-
   def get_user
     call_api(:get, Api::Path::USERS, {}, nil, false) rescue nil
   end
@@ -446,7 +448,7 @@ class Tddium < Thor
   end
 
   def git_repo?
-    unless system("git status --porcelain > /dev/null 2>&1")
+    unless system("test -d .git || git status > /dev/null 2>&1")
       message = Text::Error::GIT_NOT_INITIALIZED
       say message
     end

data/spec/spec_helper.rb

@@ -8,3 +8,16 @@ require "tddium"
 require 'rspec'
 require "fakefs/spec_helpers"
 require "tddium_client/tddium_spec_helpers"
+
+require 'ostruct'
+
+class Open3SpecHelper
+  def self.stubOpen2e(data, ok, block)
+    stdin = StringIO.new
+    output = StringIO.new(data)
+    status = (ok && 0) || 1
+    value = OpenStruct.new(:exitstatus => status, :to_i => status)
+    wait = OpenStruct.new(:value => value)
+    block.call(stdin, output, wait)
+  end
+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
@@ -117,8 +117,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)
@@ -172,6 +172,8 @@ describe Tddium do
 
   def stub_defaults
     tddium.stub(:say)
+    tddium.stub(:`).and_raise("unstubbed command")
+    tddium.stub(:system).and_raise("unstubbed command")
     stub_git_branch(tddium)
     stub_tddium_client
     stub_git_status(tddium)
@@ -189,7 +191,7 @@ describe Tddium do
   end
 
   def stub_git_config(tddium)
-    tddium.stub(:`).with(/git config/).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)
@@ -201,8 +203,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)

metadata

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