rrrspec-client 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 187ea5b96b3437a7c839c23b3e5f1aa3df3b5716
-  data.tar.gz: d83a9df93ffa5ae672b5909e887a52173f6941ff
+  metadata.gz: 7e29d68ed0c54b2cb4c4417d62f515f09f657bcc
+  data.tar.gz: 34a655fdacca55bb7f43725a82da62d8da9b4308
 SHA512:
-  metadata.gz: c6583325da9e6865baca29415e524f662ecfcdf1a7d2be524b3769748855a20f6629cfe9dae6102bf035534fd4a314a4271e5ace84e421780e56ed5121d435af
-  data.tar.gz: b1f67aba5e30a24d1ee5dad72ae4dc15587d5b25470546c29ebc290be512c3b63743ae43a1b3e630619abb1b9d1308563ad2d0347d8ed7c9cc004431e611a93e
+  metadata.gz: 7647cb60a2238e446825b32fcd388e0240418a751dfd9ef8ce65ccc34a59630f12b890e289777fbbe3c108fb78faa7b0bb42a0c2d20faba3621703728841e7f7
+  data.tar.gz: 0b8c083325761f23abc9d3d4778d2a75bc772aee29d6379477d638b9df649642ff247416ec7bfa9d62092336ff8f09489b0a16bdc4bc07f00b275c657911cfe2

data/lib/rrrspec/client/cli.rb

@@ -67,8 +67,6 @@ module RRRSpec
       desc 'nodes', 'list up the active nodes'
       def nodes
         setup(Configuration.new)
-        puts "Server:"
-        puts "\t#{RSyncInfo.exist? ? "Yes" : "No"}"
         puts "Workers:"
         Worker.list.each { |worker| puts "\t#{worker.key}" }
       end

data/lib/rrrspec/client/configuration.rb

@@ -2,7 +2,7 @@ module RRRSpec
   module Client
     class ClientConfiguration < Configuration
       attr_accessor :packaging_dir
-      attr_accessor :packaging_rsync_options
+      attr_accessor :rsync_remote_path, :rsync_options
       attr_writer :spec_files
       attr_accessor :setup_command, :slave_command
       attr_accessor :taskset_class, :worker_type

data/lib/rrrspec/client/slave_runner.rb

@@ -45,15 +45,15 @@ module RRRSpec
           @timeout = TASKQUEUE_ARBITER_TIMEOUT
           ArbiterQueue.check(@taskset)
         else
-          @timeout = TASKQUEUE_TASK_TIMEOUT
           if @worked_task_keys.include?(task.key)
             @taskset.reversed_enqueue_task(task)
             return
           else
             @worked_task_keys << task.key
           end
-
           return if task.status.present?
+
+          @timeout = TASKQUEUE_TASK_TIMEOUT
           trial = Trial.create(task, @slave)
 
           @rspec_runner.reset

data/lib/rrrspec/client/support.rb

@@ -112,9 +112,8 @@ module RRRSpec
 
       def run_rsync_package(rsync_name)
         conf = RRRSpec.configuration
-        remote_dir = File.join(RSyncInfo.rsync_dir, rsync_name)
-        remote_path = "#{RSyncInfo.rsync_server}:#{remote_dir}"
-        command = "rsync #{conf.packaging_rsync_options} #{conf.packaging_dir}/ #{remote_path}"
+        remote_path = File.join(conf.rsync_remote_path, rsync_name)
+        command = "rsync #{conf.rsync_options} #{conf.packaging_dir}/ #{remote_path}"
         $stderr.puts command
         system(command)
         $?.success?

data/lib/rrrspec/client/version.rb

@@ -1,5 +1,5 @@
 module RRRSpec
   module Client
-    VERSION = "0.2.0"
+    VERSION = "0.2.1"
   end
 end

data/lib/rrrspec/extension.rb

@@ -0,0 +1,6 @@
+class ActiveSupport::TimeWithZone
+  def as_json(*arg)
+    iso8601
+  end
+end
+

data/lib/rrrspec/redis_models.rb

@@ -10,62 +10,6 @@ module RRRSpec
     end
   end
 
-  module RSyncInfo
-    WAIT_SERVER_SEC = 10
-    RSYNC_INFO_KEY = 'rrrspec:rsync_info'
-
-    module_function
-
-    def self.hget_loop(key)
-      loop do
-        v = RRRSpec.redis.hget(RSYNC_INFO_KEY, key)
-        return v if v.present?
-        sleep WAIT_SERVER_SEC
-      end
-    end
-
-    # Public
-    def self.rsync_server
-      hget_loop('rsync_server')
-    end
-
-    # Public
-    def self.rsync_dir
-      hget_loop('rsync_dir')
-    end
-
-    # Public
-    def self.rsync_options
-      hget_loop('rsync_options')
-    end
-
-    # ==========================================================================
-    # Heartbeat
-
-    # Public: Check its existence.
-    #
-    # Returns bool
-    def self.exist?
-      RRRSpec.redis.exists('rrrspec:rsync_info')
-    end
-
-    # Public: Maintain heartbeat
-    def self.heartbeat(time)
-      unless Dir.exist?(RRRSpec.configuration.rsync_dir)
-        FileUtils.makedirs(RRRSpec.configuration.rsync_dir)
-      end
-      RRRSpec.redis.multi do
-        RRRSpec.redis.hmset(
-          'rrrspec:rsync_info',
-          'rsync_server', RRRSpec.configuration.rsync_server,
-          'rsync_dir', RRRSpec.configuration.rsync_dir,
-          'rsync_options', RRRSpec.configuration.rsync_options
-        )
-        RRRSpec.redis.expire('rrrspec:rsync_info', time)
-      end
-    end
-  end
-
   module ArbiterQueue
     ARBITER_QUEUE_KEY = 'rrrspec:arbiter_queue'
 

data/lib/rrrspec.rb

@@ -6,6 +6,7 @@ require 'logger'
 Time.zone_default = Time.find_zone('UTC')
 
 require 'rrrspec/configuration'
+require 'rrrspec/extension'
 require 'rrrspec/redis_models'
 
 module RRRSpec
@@ -67,11 +68,13 @@ module RRRSpec
     end
   end
 
+  # When there's no suitable home directory, File.expand_path raises ArgumentError
+  home_rrrspec = File.expand_path('~/.rrrspec') rescue nil
   DEFAULT_CONFIG_FILES = [
-    File.expand_path('~/.rrrspec'),
+    home_rrrspec,
     '.rrrspec',
     '.rrrspec-local'
-  ]
+  ].compact
 
   def setup(configuration, config_files)
     RRRSpec.configuration = configuration

data/rrrspec-client.gemspec

@@ -27,7 +27,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake"
   spec.add_dependency "activesupport"
   spec.add_dependency "extreme_timeout"
-  spec.add_dependency "facter"
   spec.add_dependency "launchy"
   spec.add_dependency "redis"
   spec.add_dependency "rspec", ">= 2.14.1"

metadata

@@ -1,167 +1,153 @@
 --- !ruby/object:Gem::Specification
 name: rrrspec-client
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Masaya Suzuki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-18 00:00:00.000000000 Z
+date: 2014-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: extreme_timeout
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: facter
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: launchy
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.14.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.14.1
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: uuidtools
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: tzinfo
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Execute RSpec in a distributed manner
@@ -173,8 +159,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .rspec
-- .ruby-version
+- ".rspec"
 - Gemfile
 - Rakefile
 - bin/rrrspec
@@ -188,6 +173,7 @@ files:
 - lib/rrrspec/client/support.rb
 - lib/rrrspec/client/version.rb
 - lib/rrrspec/configuration.rb
+- lib/rrrspec/extension.rb
 - lib/rrrspec/redis_models.rb
 - rrrspec-client.gemspec
 - spec/fixture.rb
@@ -204,17 +190,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Execute RSpec in a distributed manner

data/.ruby-version

@@ -1 +0,0 @@
-2.0.0-p247