tddium-preview 0.7.0 → 0.7.1

data/.gitignore

@@ -53,3 +53,4 @@ nbproject
 *.swp
 *.swo
 .tddium.staging
+.tddium-deploy-key.staging

data/Gemfile

@@ -2,3 +2,11 @@ source "http://rubygems.org"
 
 # Specify your gem's dependencies in tddium.gemspec
 gemspec
+
+group :development, :test do
+  gem 'aruba'
+  gem 'pickle'
+  gem 'mimic'
+  gem 'daemons'
+  gem 'httparty'
+end

data/Gemfile.lock

@@ -1,23 +1,51 @@
 PATH
   remote: .
   specs:
-    tddium-preview (0.7.0)
+    tddium-preview (0.7.1)
       bundler
       highline
       json
-      tddium_client (>= 0.0.8)
+      tddium_client (>= 0.0.9)
+      tddium_reporting (>= 0.0.3)
       thor
 
 GEM
   remote: http://rubygems.org/
   specs:
+    aruba (0.3.6)
+      childprocess (>= 0.1.7)
+      cucumber (>= 0.10.0)
+      rspec (>= 2.5.0)
+    builder (3.0.0)
+    childprocess (0.2.0)
+      ffi (~> 1.0.6)
     crack (0.1.8)
+    cucumber (1.0.2)
+      builder (>= 2.1.2)
+      diff-lcs (>= 1.1.2)
+      gherkin (~> 2.4.5)
+      json (>= 1.4.6)
+      term-ansicolor (>= 1.0.5)
+    daemons (1.1.4)
     diff-lcs (1.1.2)
     fakefs (0.3.1)
+    ffi (1.0.9)
+    gherkin (2.4.5)
+      json (>= 1.4.6)
     highline (1.6.2)
-    httparty (0.7.7)
+    httparty (0.7.8)
       crack (= 0.1.8)
-    json (1.5.1)
+    json (1.5.3)
+    mimic (0.4.3)
+      json
+      plist
+      rack
+      sinatra
+    pickle (0.4.8)
+      cucumber (>= 0.8)
+      rake
+    plist (3.1.0)
+    rack (1.3.0)
     rake (0.8.7)
     rspec (2.5.0)
       rspec-core (~> 2.5.0)
@@ -30,16 +58,27 @@ GEM
     simplecov (0.4.1)
       simplecov-html (~> 0.4.3)
     simplecov-html (0.4.3)
-    tddium_client (0.0.8)
+    sinatra (1.2.6)
+      rack (~> 1.1)
+      tilt (< 2.0, >= 1.2.2)
+    tddium_client (0.0.9)
       httparty
       json
+    tddium_reporting (0.0.3)
+    term-ansicolor (1.0.6)
     thor (0.14.6)
+    tilt (1.3.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  aruba
+  daemons
   fakefs
+  httparty
+  mimic
+  pickle
   rake
   rspec
   simplecov

data/features/manage_login.feature

@@ -0,0 +1,18 @@
+@mimic
+Feature: Manage Login
+
+  Scenario: Log in successfully
+    Given the user can log in and gets API key "apikey"
+    #When I run `tddium login --environment=mimic --email=user@example.org --password=password`
+    When I run `tddium login --environment=mimic` interactively
+    And I type "foo@example.com"
+    And I type "barbarbar"
+    And the console session ends
+    Then the output should contain:
+    """
+    Logged in successfully
+    """
+    And the exit status should be 0
+    And the file ".tddium.mimic" should contain "apikey"
+    And the file ".gitignore" should contain ".tddium.mimic"
+    And the file ".gitignore" should contain ".tddium-deploy-key.mimic"

data/features/step_definitions/mimic_steps.rb

@@ -0,0 +1,7 @@
+Given /^the user can log in and gets API key "([^"]*)"$/ do |apikey|
+  MimicServer.server.install(:post, "/1/users/sign_in", {:status=>0, :api_key=>apikey})
+end
+
+When /^the console session ends$/ do
+  @last_exit_status = @interactive.stop
+end

data/features/support/env.rb

@@ -0,0 +1,5 @@
+require 'rubygems'
+require 'aruba/cucumber'
+require 'pickle/parser'
+
+ENV['PATH'] = "#{File.expand_path(File.dirname(__FILE__) + '/../../bin')}#{File::PATH_SEPARATOR}#{ENV['PATH']}"

data/features/support/mimic.rb

@@ -0,0 +1,129 @@
+require 'mimic'
+require 'timeout'
+require 'daemons'
+require 'httparty'
+
+class MimicServer
+  attr_reader :port
+
+  def initialize
+    @port = 8080
+    @pid_dir = File.join(Dir.tmpdir, 'mimic')
+    FileUtils.mkdir_p(@pid_dir)
+  end
+
+  def start
+    options = {:ARGV => ['start'], :log_output => true, :dir_mode => :normal, :dir => @pid_dir}
+    args = {:fork => false,
+            :host => 'localhost',
+            :port => @port,
+            :remote_configuration_path => '/api'}
+    @mimic_group = Daemons.run_proc("mimic", options) do
+      Mimic.mimic(args) do
+        [:INT, :TERM].each { |sig| trap(sig) { STDERR.puts "got sig!"; Kernel.exit!(0) } }
+      end
+    end
+    @mimic_group.setup
+    wait
+  end
+
+  def stop
+    return nil unless @mimic_group
+    @mimic_group.stop_all
+    @mimic_group.find_applications(@pid_dir)
+    @mimic_group.zap_all
+  end
+
+  def wait
+    (0...5).each do |i|
+      if ping then
+        break
+      end
+      Kernel.sleep(0.1)
+    end
+  end
+
+  def ping
+    begin
+      http = call_api(:get,  '/api/ping')
+    rescue Exception, Timeout::Error
+      return false
+    end
+    return http.code == 200
+  end
+
+  def clear
+    http = call_api(:post,  '/api/clear')
+    return http
+  end
+
+  def install(verb, path, body, headers = {})
+    params = { 'path' => path, 'body' => body.to_json }.to_json
+    http = call_api(:post,  "/api/#{verb}", params, headers)
+    return http
+  end
+
+  def call_api(method, path, params = {}, headers = {})
+    tries = 0
+    retries = 7
+    done = false
+    while (tries <= retries) && !done
+      begin
+        http = HTTParty.send(method, "http://localhost:#{@port}#{path}",
+                             :body => params, :headers => headers)
+        done = true
+      rescue SystemCallError
+        Kernel.sleep(0.5)
+      rescue Timeout::Error
+        Kernel.sleep(0.5)
+      ensure
+        tries += 1
+      end
+    end
+    raise Timeout::Error if tries > retries && retries >= 0
+    return http
+  end
+
+  class << self
+    def test
+      mimic = MimicServer.start
+      mimic.clear
+      mimic.stop
+    end
+
+    def start
+      return @server if @server
+      @server = MimicServer.new
+      @server.start
+      @server
+    end
+
+    def server
+      @server
+    end
+
+    def clear
+      @server.clear rescue nil
+    end
+  end
+end
+
+if __FILE__ == $0 then
+  MimicServer.test
+end
+
+Before('@mimic') do
+  MimicServer.start
+#  @aruba_io_wait_seconds = 4
+end
+
+After('@mimic') do
+  MimicServer.clear
+end
+
+at_exit do
+  server = MimicServer.server
+  server.stop if server
+end
+
+MimicServer.start

data/lib/tddium.rb

@@ -286,23 +286,16 @@ class Tddium < Thor
       if current_suites["suites"].size == 0
         say Text::Status::NO_SUITE
       else
-        say Text::Status::ALL_SUITES % current_suites["suites"].collect {|suite| suite["repo_name"]}.join(", ")
-
         if current_suite = current_suites["suites"].detect {|suite| suite["id"] == current_suite_id}
+          show_session_details({:active => false, :order => "date", :limit => 10}, Text::Status::NO_INACTIVE_SESSION, Text::Status::INACTIVE_SESSIONS)
+          show_session_details({:active => true}, Text::Status::NO_ACTIVE_SESSION, Text::Status::ACTIVE_SESSIONS)
           say Text::Status::SEPARATOR
           say Text::Status::CURRENT_SUITE % current_suite["repo_name"]
-
           display_attributes(DisplayedAttributes::SUITE, current_suite)
-
-          show_session_details({:active => true}, Text::Status::NO_ACTIVE_SESSION, Text::Status::ACTIVE_SESSIONS)
-          show_session_details({:active => false, :order => "date", :limit => 10}, Text::Status::NO_INACTIVE_SESSION, Text::Status::INACTIVE_SESSIONS)
         else
           say Text::Status::CURRENT_SUITE_UNAVAILABLE
         end
       end
-
-      account_usage = call_api(:get, Api::Path::ACCOUNT_USAGE)
-      say account_usage["usage"]
     rescue TddiumClient::Error::Base
     end
   end
@@ -670,7 +663,7 @@ class Tddium < Thor
         say no_session_prompt
       else
         say all_session_prompt
-        current_sessions["sessions"].each do |session|
+        current_sessions["sessions"].reverse_each do |session|
           session_id = session.delete("id")
           say Text::Status::SESSION_TITLE % session_id
           display_attributes(DisplayedAttributes::TEST_EXECUTION, session)
@@ -686,6 +679,20 @@ class Tddium < Thor
     # Account creation date
     user = api_response["user"]
     say ERB.new(Text::Status::USER_DETAILS).result(binding)
+
+    begin
+      current_suites = call_api(:get, Api::Path::SUITES)
+      if current_suites["suites"].size == 0 then
+        say Text::Status::NO_SUITE
+      else
+        say Text::Status::ALL_SUITES % current_suites["suites"].collect {|suite| suite["repo_name"]}.join(", ")
+      end
+
+      account_usage = call_api(:get, Api::Path::ACCOUNT_USAGE)
+      say account_usage["usage"]
+    rescue TddiumClient::Error::Base => e
+puts "EXN: #{e.inspect}"
+    end
   end
 
   def format_suite_details(suite)

data/lib/tddium/constant.rb

@@ -12,7 +12,7 @@ module TddiumConstant
     SLEEP_TIME_BETWEEN_POLLS = 2
     ENVIRONMENT = "production"
     SSH_FILE = "~/.ssh/id_rsa.pub"
-    SUITE_TEST_PATTERN = "features/*.feature, spec/**/*_spec.rb, test/**/test_*.rb"
+    SUITE_TEST_PATTERN = "features/*.feature, spec/**/*_spec.rb, test/**/*_test.rb"
   end
 
   module Git

data/lib/tddium/version.rb

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

data/tddium.gemspec

@@ -35,7 +35,8 @@ EOF
   s.add_runtime_dependency("thor")
   s.add_runtime_dependency("highline")
   s.add_runtime_dependency("json")
-  s.add_runtime_dependency("tddium_client", ">=0.0.8")
+  s.add_runtime_dependency("tddium_client", ">=0.0.9")
+  s.add_runtime_dependency("tddium_reporting", ">=0.0.3")
   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.7.0
+  version: 0.7.1
 platform: ruby
 authors: 
 - Solano Labs
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-10 00:00:00 -07:00
+date: 2011-08-01 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -54,22 +54,22 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.0.8
+        version: 0.0.9
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: bundler
+  name: tddium_reporting
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 0.0.3
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: bundler
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
@@ -77,10 +77,10 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version 
         version: "0"
-  type: :development
+  type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: fakefs
+  name: rspec
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
@@ -91,7 +91,7 @@ dependencies:
   type: :development
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: simplecov
+  name: fakefs
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
@@ -102,7 +102,7 @@ dependencies:
   type: :development
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: rake
+  name: simplecov
   prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
@@ -112,6 +112,17 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id010
 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
@@ -140,6 +151,11 @@ files:
 - README.rdoc
 - Rakefile
 - bin/tddium
+- features/manage_login.feature
+- features/step_definitions/login_steps.rb
+- features/step_definitions/mimic_steps.rb
+- features/support/env.rb
+- features/support/mimic.rb
 - lib/tddium.rb
 - lib/tddium/constant.rb
 - lib/tddium/heroku.rb