tddium-preview 0.9.2 → 0.9.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tddium-preview (0.9.0)
+    tddium-preview (0.9.3)
       bundler
       highline
       json
@@ -12,7 +12,7 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    antilles (0.1.3)
+    antilles (0.1.4)
       bundler
       daemons
       httparty
@@ -29,7 +29,6 @@ GEM
     builder (3.0.0)
     childprocess (0.2.2)
       ffi (~> 1.0.6)
-    crack (0.1.8)
     cucumber (1.0.2)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.2)
@@ -43,19 +42,22 @@ GEM
     gherkin (2.4.21)
       json (>= 1.4.6)
     highline (1.6.2)
-    httparty (0.7.8)
-      crack (= 0.1.8)
+    httparty (0.8.0)
+      multi_json
+      multi_xml
     json (1.6.1)
     mimic (0.4.3)
       json
       plist
       rack
       sinatra
+    multi_json (1.0.3)
+    multi_xml (0.4.1)
     pickle (0.4.8)
       cucumber (>= 0.8)
       rake
     plist (3.1.0)
-    rack (1.3.2)
+    rack (1.3.3)
     rake (0.9.2)
     rdiscount (1.6.8)
     rspec (2.6.0)

data/bin/tddium

@@ -4,7 +4,7 @@
 #
 
 require 'yaml'
-YAML::ENGINE.yamler = 'syck'
+YAML::ENGINE.yamler = 'syck' if defined?(YAML::ENGINE)
 
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 require "tddium"

data/features/account_command.feature

@@ -1,3 +1,5 @@
+# Copyright (c) 2011 Solano Labs All Rights Reserved
+
 @mimic
 Feature: Account command
   As a Tddium user
@@ -71,4 +73,3 @@ Feature: Account command
     """
     tddium must be initialized. Try 'tddium login'
     """
-

data/features/activate_command.feature

@@ -1,3 +1,5 @@
+# Copyright (c) 2011 Solano Labs All Rights Reserved
+
 @mimic
 Feature: Activate command
   As a Tddium user

data/features/login_command.feature

@@ -1,3 +1,5 @@
+# Copyright (c) 2011 Solano Labs All Rights Reserved
+
 @mimic
 Feature: Login command
 

data/features/logout_command.feature

@@ -1,3 +1,5 @@
+# Copyright (c) 2011 Solano Labs All Rights Reserved
+
 @mimic
 Feature: Logout Command
 

data/features/step_definitions/account_steps.rb

@@ -1,3 +1,5 @@
+# Copyright (c) 2011 Solano Labs All Rights Reserved
+
 Given /^the user has the following memberships in his account:$/ do |table|
   Antilles.install(:get, "/1/memberships", {:status=>0, :memberships=>table.hashes})
   @memberships = {}

data/features/step_definitions/activate_steps.rb

@@ -1,3 +1,5 @@
+# Copyright (c) 2011 Solano Labs All Rights Reserved
+
 Given /^"([^"]*)" is a valid invitation token$/ do |arg1|
   Antilles.install(:post, "/1/users", SAMPLE_USER_RESPONSE, :code=>201)
 end

data/features/step_definitions/aruba_steps.rb

@@ -1,3 +1,4 @@
+# Copyright (c) 2011 Solano Labs All Rights Reserved
 
 When /^the console session ends$/ do
   @last_exit_status = @interactive.stop(true)

data/features/step_definitions/login_steps.rb

@@ -1,3 +1,5 @@
+# Copyright (c) 2011 Solano Labs All Rights Reserved
+
 Given /^the user is logged in$/ do
   @api_key = "abcdef"
   Antilles.install(:get, "/1/users", SAMPLE_USER_RESPONSE)

data/features/step_definitions/mimic_steps.rb

@@ -1,3 +1,5 @@
+# Copyright (c) 2011 Solano Labs All Rights Reserved
+
 Given /^the command is "([^"]*)"$/ do |command|
   @command = command
 end

data/features/step_definitions/suite_steps.rb

@@ -1,3 +1,5 @@
+# Copyright (c) 2011 Solano Labs All Rights Reserved
+
 def make_suite_response(name, branch)
   suite = SAMPLE_SUITE_RESPONSE
   suite["repo_name"] = name

data/features/suite_command.feature

@@ -1,3 +1,5 @@
+# Copyright (c) 2011 Solano Labs All Rights Reserved
+
 @mimic
 Feature: suite command
   As a user
@@ -43,6 +45,3 @@ Feature: suite command
     Then the output from "tddium suite" should contain "Created suite..."
     When the console session ends
     Then the exit status should be 0
-
-
-

data/features/support/aruba.rb

@@ -1,3 +1,5 @@
+# Copyright (c) 2011 Solano Labs All Rights Reserved
+
 Before do
   @aruba_timeout_seconds = 10
   @aruba_io_wait_seconds = 2

data/features/support/constants.rb

@@ -1,3 +1,5 @@
+# Copyright (c) 2011 Solano Labs All Rights Reserved
+
 require 'aruba/api'
 
   SAMPLE_API_KEY = "afb12412bdafe124124asfasfabebafeabwbawf1312342erbfasbb"

data/features/support/env.rb

@@ -1,3 +1,5 @@
+# Copyright (c) 2011 Solano Labs All Rights Reserved
+
 require 'rubygems'
 require 'aruba/cucumber'
 require 'pickle/parser'

data/features/support/mimic.rb

@@ -2,8 +2,7 @@
 
 require 'antilles/cucumber'
 
-tid = ENV['TDDIUM_TID'] || 0
-port = 8500 + tid.to_i
+port = Antilles.find_available_port
 ENV['TDDIUM_CLIENT_PORT'] = port.to_s
 ENV['TDDIUM_CLIENT_ENVIRONMENT'] = 'mimic'
 

data/lib/tddium.rb

@@ -92,7 +92,8 @@ class Tddium < Thor
         write_api_key(new_user["user"]["api_key"])
         role = new_user["user"]["account_role"]
         if role.nil? || role == "owner"
-          say Text::Process::ACCOUNT_CREATED % [new_user["user"]["email"], new_user["user"]["recurly_url"]]
+          u = new_user["user"]
+          say Text::Process::ACCOUNT_CREATED % [u["email"], u["trial_remaining"], u["recurly_url"]]
         else
           say Text::Process::ACCOUNT_ADDED % [new_user["user"]["email"], new_user["user"]["account_role"], new_user["user"]["account"]]
         end
@@ -432,9 +433,13 @@ class Tddium < Thor
 
   def call_api(method, api_path, params = {}, api_key = nil, show_error = true)
     api_key =  tddium_settings(:fail_with_message => false)["api_key"] if tddium_settings(:fail_with_message => false) && api_key != false
+    params[:tddium_gem_version] = TddiumVersion::VERSION
     begin
       result = tddium_client.call_api(method, api_path, params, api_key)
     rescue TddiumClient::Error::Base => e
+
+      exit_failure e.message if e.status == Api::ErrorCode::GEM_OUT_OF_DATE
+
       say e.message if show_error
       raise e
     end
@@ -581,6 +586,15 @@ class Tddium < Thor
     message.nil?
   end
 
+  def git_root
+    root = `git rev-parse --show-toplevel 2>&1`
+    if $?.exitstatus == 0 then
+      root.chomp! if root
+      return root
+    end
+    return Dir.pwd
+  end
+
   def git_origin_url
     result = `(git config --get remote.origin.url || echo GIT_FAILED) 2>/dev/null`
     return nil if result =~ /GIT_FAILED/
@@ -593,7 +607,7 @@ class Tddium < Thor
 
   def handle_heroku_user(options, heroku_config)
     api_key = heroku_config['TDDIUM_API_KEY']
-    user = tddium_client.call_api(:get, Api::Path::USERS, {}, api_key) rescue nil
+    user = call_api(:get, Api::Path::USERS, {}, api_key, false) rescue nil
     exit_failure Text::Error::HEROKU_MISCONFIGURED % "Unrecognized user" unless user
     say Text::Process::HEROKU_WELCOME % user["user"]["email"]
 
@@ -610,7 +624,7 @@ class Tddium < Thor
 
       begin
         user_id = user["user"]["id"]
-        result = tddium_client.call_api(:put, "#{Api::Path::USERS}/#{user_id}/", {:user=>params, :heroku_activation=>true}, api_key)
+        result = call_api(:put, "#{Api::Path::USERS}/#{user_id}/", {:user=>params, :heroku_activation=>true}, api_key)
       rescue TddiumClient::Error::API => e
         exit_failure Text::Error::HEROKU_MISCONFIGURED % e
       rescue TddiumClient::Error::Base => e
@@ -808,7 +822,7 @@ puts "EXN: #{e.inspect}"
 
   def tddium_deploy_key_file_name
     extension = ".#{environment}" unless environment == :production
-    ".tddium-deploy-key#{extension}"
+    return File.join(git_root, ".tddium-deploy-key#{extension}")
   end
 
   def suite_for_current_branch?
@@ -829,7 +843,7 @@ puts "EXN: #{e.inspect}"
 
   def tddium_file_name
     extension = ".#{environment}" unless environment == :production
-    ".tddium#{extension}"
+    return File.join(git_root, ".tddium#{extension}")
   end
 
   def tddium_settings(options = {})

data/lib/tddium/constant.rb

@@ -22,6 +22,7 @@ module TddiumConstant
   module Git
     REMOTE_NAME = "tddium"
     GITIGNORE = ".gitignore"
+    READY_TRIES = 3
   end
 
   module Api
@@ -39,6 +40,7 @@ module TddiumConstant
     end
     module ErrorCode
       INVALID_INVITATION = 2
+      GEM_OUT_OF_DATE = 10000
     end
   end
 
@@ -99,12 +101,15 @@ Next, you should:
 1. Register your test suite by running:
 tddium suite
 
-2. Sign up for a billing plan by opening this URL in your browser:
-%s
-
-3. Start tests by running:
+2. Start tests by running:
 tddium spec
 
+You have %s days left in your free trial.
+
+To sign up a for a billing plan, open this URL in your browser:
+
+%s
+
 "
       ACCOUNT_ADDED = "
 Congratulations %s, your tddium account has been activated.
@@ -208,14 +213,12 @@ EOF
       SEPARATOR = "====="
       USING_SUITE = "Using suite...\n\n%s"
       USER_DETAILS =<<EOF;
+
 Username: <%=user["email"]%>
 Account Created: <%=user["created_at"]%>
-<% if user["recurly_url"] %>
-Recurly Management URL: <%=user["recurly_url"]%>
-<% end %>
-<% if user["heroku"] %>
-Heroku Account Linked: <%=user["heroku_activation_done"]%>
-<% end %>
+<% if user["trial_remaining"] && user["trial_remaining"] > 0 %>Trial Period Remaining: <%=user["trial_remaining"]%> days<% end %>
+<% if user["recurly_url"] %>Account Management URL: <%=user["recurly_url"]%><% end %>
+<% if user["heroku"] %>Heroku Account Linked: <%=user["heroku_activation_done"]%><% end %>
 EOF
       HEROKU_CONFIG = "
 Tddium is configured to work with your Heroku app.

data/lib/tddium/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tddium-preview
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-23 00:00:00.000000000 Z
+date: 2011-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &9705000 !ruby/object:Gem::Requirement
+  requirement: &18134260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9705000
+  version_requirements: *18134260
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &9704580 !ruby/object:Gem::Requirement
+  requirement: &18133840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9704580
+  version_requirements: *18133840
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &9703980 !ruby/object:Gem::Requirement
+  requirement: &18133420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9703980
+  version_requirements: *18133420
 - !ruby/object:Gem::Dependency
   name: tddium_client
-  requirement: &9703300 !ruby/object:Gem::Requirement
+  requirement: &18132920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 0.0.10
   type: :runtime
   prerelease: false
-  version_requirements: *9703300
+  version_requirements: *18132920
 - !ruby/object:Gem::Dependency
   name: tddium_reporting
-  requirement: &9702080 !ruby/object:Gem::Requirement
+  requirement: &18132420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 0.0.5
   type: :runtime
   prerelease: false
-  version_requirements: *9702080
+  version_requirements: *18132420
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &9701100 !ruby/object:Gem::Requirement
+  requirement: &18130200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9701100
+  version_requirements: *18130200
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &9700640 !ruby/object:Gem::Requirement
+  requirement: &18129700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *9700640
+  version_requirements: *18129700
 - !ruby/object:Gem::Dependency
   name: fakefs
-  requirement: &9700080 !ruby/object:Gem::Requirement
+  requirement: &18129240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *9700080
+  version_requirements: *18129240
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &9699440 !ruby/object:Gem::Requirement
+  requirement: &18128820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *9699440
+  version_requirements: *18128820
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &9698800 !ruby/object:Gem::Requirement
+  requirement: &18128400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +120,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *9698800
+  version_requirements: *18128400
 description: ! 'tddium runs your rspec, cucumber, and test::unit tests in our managed
 
   cloud environment.  You can run tests by hand, or enable our hosted CI to watch