tddium-preview 0.6.18 → 0.6.19

data/Gemfile.lock

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

data/lib/tddium/constant.rb

@@ -220,43 +220,56 @@ Push URL: <%=suite["ci_push_url"]%>
 Notifications:
 <%=suite["ci_notifications"]%>
 
-Authorize the following SSH key to let Tddium's pulls and pushes through:
+>>> Authorize the following SSH key to let Tddium's pulls and pushes through:
 
 <%=suite["ci_ssh_pubkey"]%>
 <% if suite["ci_pull_url"] =~ /^git@github.com:(.*).git$/ %>
 Tddium will pull from your Github repository. Visit
+
 https://github.com/<%= $1 %>/admin/keys
+
 then click "Add another deploy key" and copy and paste the above key.
 <% end %>
 <% if suite["ci_push_url"] =~ /^git@heroku.com:(.*).git$/ %>
 Tddium will push to your Heroku application <%= $1 %>.
 To authorize the key, use the following command:
+
 heroku keys:add <%= tddium_deploy_key_file_name %> --app <%= $1 %>
 <% end %>
 
 <% if suite["ci_pull_url"] =~ /^git@github.com:(.*).git$/ %>
-Github can notify Tddium of your commits with a post-receive hook. Visit
+>>> Github can notify Tddium of your commits with a post-receive hook. Visit
+
 https://github.com/<%= $1 %>/admin/hooks#generic_minibucket
+
 then add the following URL and click "Update Settings":
+
 <%=suite["hook_uri"]%>
 <% else %>
-It looks like you aren't using Github, so you'll need to manually configure
-your post-commit hook. In Unix-based Git repositories, find the repository
-root and look for a shell script in `.git/hooks/post-commit`.
+>>> In order for Tddium to know that your repo has changed, you'll need to configure
+a post-commit hook in your Git server.
+
+In Unix-based Git repositories, find the repository root and look for a shell
+script in `.git/hooks/post-commit`.
+
 To trigger CI builds, POST to the following URL from a post-commit hook:
+<%=suite["hook_uri"]%>
 <% end %>
 
-See http://www.tddium.com/support for more information on Tddium CI.
+>>> See http://www.tddium.com/support for more information on Tddium CI.
 <% end %>
 
-If your tests don't require a database, you're all set and can now run
-tddium spec.
+If your tests don't require a database or your app uses pure ActiveRecord you're
+all set and can now run tddium spec.
 
-If your tests do use a database, you'll now need to configure your 
-database setup. See http://www.tddium.com/support/reference#setup_hooks 
-to create a Rake task for Tddium to set up your database.
+If your app needs database-specific features (triggers, stored procedures),
+you'll need to configure a custom database setup hook.
+See http://www.tddium.com/support/reference#setup_hooks to create a Rake task for
+Tddium to set up your database.
 
 Run 'tddium suite --edit' to edit suite settings.
+
+Run 'tddium spec' to run tests in this suite.
 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.18"
+  VERSION = "0.6.19"
 end

data/lib/tddium.rb

@@ -35,6 +35,7 @@ class Tddium < Thor
   method_option :password, :type => :string, :default => nil
   method_option :ssh_key_file, :type => :string, :default => nil
   def account
+    set_shell
     set_default_environment(options[:environment])
     if user_details = user_logged_in?
       # User is already logged in, so just display the info
@@ -80,6 +81,7 @@ class Tddium < Thor
   method_option :ssh_key_file, :type => :string, :default => nil
   method_option :app, :type => :string, :default => nil
   def heroku
+    set_shell
     set_default_environment(options[:environment])
     if user_details = user_logged_in?
       # User is already logged in, so just display the info
@@ -110,6 +112,7 @@ class Tddium < Thor
   map "passwd" => :password
   method_option :environment, :type => :string, :default => nil
   def password
+    set_shell
     set_default_environment(options[:environment])
     return unless tddium_settings
     user_details = user_logged_in?
@@ -137,6 +140,7 @@ class Tddium < Thor
   method_option :email, :type => :string, :default => nil
   method_option :password, :type => :string, :default => nil
   def login
+    set_shell
     set_default_environment(options[:environment])
     if user_logged_in?
       say Text::Process::ALREADY_LOGGED_IN
@@ -148,6 +152,7 @@ class Tddium < Thor
   desc "logout", "Log out of tddium"
   method_option :environment, :type => :string, :default => nil
   def logout
+    set_shell
     set_default_environment(options[:environment])
     FileUtils.rm(tddium_file_name) if File.exists?(tddium_file_name)
     say Text::Process::LOGGED_OUT_SUCCESSFULLY
@@ -160,6 +165,7 @@ class Tddium < Thor
   method_option :test_pattern, :type => :string, :default => nil
   method_option :force, :type => :boolean, :default => false
   def spec
+    set_shell
     set_default_environment(options[:environment])
     git_version_ok
     if git_changes then
@@ -270,6 +276,7 @@ class Tddium < Thor
   desc "status", "Display information about this suite, and any open dev sessions"
   method_option :environment, :type => :string, :default => nil
   def status
+    set_shell
     set_default_environment(options[:environment])
     git_version_ok
     return unless git_repo? && tddium_settings && suite_for_current_branch?
@@ -521,7 +528,7 @@ class Tddium < Thor
     api_key = heroku_config['TDDIUM_API_KEY']
     user = tddium_client.call_api(:get, Api::Path::USERS, {}, api_key) rescue nil
     exit_failure Text::Error::HEROKU_MISCONFIGURED % "Unrecognized user" unless user
-    say Text::Process::HEROKU_WELCOME % heroku_config['TDDIUM_USER_NAME']
+    say Text::Process::HEROKU_WELCOME % user["user"]["email"]
 
     if user["user"]["heroku_needs_activation"] == true
       say Text::Process::HEROKU_ACTIVATE
@@ -639,6 +646,12 @@ class Tddium < Thor
     [use_existing_suite, existing_suite]
   end
 
+  def set_shell
+    if !$stdout.tty? || !$stderr.tty? then
+      @shell = Thor::Shell::Basic.new
+    end
+  end
+
   def set_default_environment(env)
     if env.nil?
       tddium_client.environment = :development

metadata

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