larrow-runner 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 649d405f97c00eba29947141c7c23f97da18b783
-  data.tar.gz: ab1fe09db103b64cb52fcc1003cf3ba3e4e0faa4
+  metadata.gz: 2c95b382b38fc64696236c9787628559fc98370b
+  data.tar.gz: 885f40783bd3a22542e4093833d96bbe75d3b776
 SHA512:
-  metadata.gz: 0ca859ab0d4d0f713a0a3e86d0340ca1b91d76e941acfe97e4318ead3e09fe9347d99f65118a357629be6a045edbc907e23ac9055da03c0eb10933765524dc23
-  data.tar.gz: f85aaf2b37ddfd2b8e0ef2daed67bbc591b3c8b75343efbf0b8f1c8105f30505d678e9b4dbcb8170fe3df1e887b55ee73d5a0c96ae3f46f8277519039163e8bc
+  metadata.gz: 8b7a87e391867ed386e7e53cb4a5db5064eb5e475640e6dfff776ba7474a099966c236071db37eec2aef5157442c4ec114860019e91d54dac03e4852b09c0cc3
+  data.tar.gz: 5f9629bc468942d32aa3570e32802db24397b516627fc77f19af0408f99045f835704cda3286262145c7eedcbddafc2a29f35118cc2203ffd85d5309f00cce8c

data/RELEASE

@@ -0,0 +1,16 @@
+2014.11.02. version 0.0.3
+=========================
+
+* clean dependency: remove `active_support`
+* open verbose mode on tests
+* delete resource file when cleanup
+* ensure node start( use `nmap` to detect)
+* use larrow-qingcloud v0.0.2
+
+2014.10.19. version 0.0.2
+=========================
+
+* hotfix: undefined method `address` for Node
+* remove some third party libs
+* check cloud login before execute
+* some changes for user convenience

data/larrow-runner.gemspec

@@ -33,7 +33,7 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "faraday", '~> 0.9'
  
-  spec.add_runtime_dependency 'larrow-qingcloud', '~> 0'     
+  spec.add_runtime_dependency 'larrow-qingcloud', '~> 0.0', '>= 0.0.2'
   spec.add_runtime_dependency 'promising', '~> 0.3'
 
 end

data/lib/active_support/core_ext/hash.rb

@@ -1,7 +1 @@
-require 'active_support/core_ext/hash/compact'
-require 'active_support/core_ext/hash/deep_merge'
-require 'active_support/core_ext/hash/except'
 require 'active_support/core_ext/hash/indifferent_access'
-require 'active_support/core_ext/hash/keys'
-require 'active_support/core_ext/hash/reverse_merge'
-require 'active_support/core_ext/hash/slice'

data/lib/active_support/core_ext/string.rb

@@ -0,0 +1 @@
+require 'active_support/core_ext/string/indent'

data/lib/active_support/core_ext/string/indent.rb

@@ -0,0 +1,43 @@
+class String
+  # Same as +indent+, except it indents the receiver in-place.
+  #
+  # Returns the indented string, or +nil+ if there was nothing to indent.
+  def indent!(amount, indent_string=nil, indent_empty_lines=false)
+    indent_string = indent_string || self[/^[ \t]/] || ' '
+    re = indent_empty_lines ? /^/ : /^(?!$)/
+    gsub!(re, indent_string * amount)
+  end
+
+  # Indents the lines in the receiver:
+  #
+  #   <<EOS.indent(2)
+  #   def some_method
+  #     some_code
+  #   end
+  #   EOS
+  #   # =>
+  #     def some_method
+  #       some_code
+  #     end
+  #
+  # The second argument, +indent_string+, specifies which indent string to
+  # use. The default is +nil+, which tells the method to make a guess by
+  # peeking at the first indented line, and fallback to a space if there is
+  # none.
+  #
+  #   "  foo".indent(2)        # => "    foo"
+  #   "foo\n\t\tbar".indent(2) # => "\t\tfoo\n\t\t\t\tbar"
+  #   "foo".indent(2, "\t")    # => "\t\tfoo"
+  #
+  # While +indent_string+ is typically one space or tab, it may be any string.
+  #
+  # The third argument, +indent_empty_lines+, is a flag that says whether
+  # empty lines should be indented. Default is false.
+  #
+  #   "foo\n\nbar".indent(2)            # => "  foo\n\n  bar"
+  #   "foo\n\nbar".indent(2, nil, true) # => "  foo\n  \n  bar"
+  #
+  def indent(amount, indent_string=nil, indent_empty_lines=false)
+    dup.tap {|_| _.indent!(amount, indent_string, indent_empty_lines)}
+  end
+end

data/lib/larrow/runner/cli/tools.rb

@@ -18,7 +18,7 @@ You can save it as .larrow.yml on the project root folder.
       
       desc 'resource','show all resource in Resource.yml'
       long_desc <<-EOF.gsub("\n", "\x5")
-Read .larrow.resource from current directory, show information.
+Read #{ResourcePath} from current directory, show information.
 resource: instance, eip, etc...
       EOF
       def resource
@@ -27,7 +27,7 @@ resource: instance, eip, etc...
       
       desc 'cleanup','cleanup all resource in Resource.yml'
       long_desc <<-EOF.gsub("\n", "\x5")
-Read .larrow.resource from current directory, and release all resources.
+Read #{ResourcePath} from current directory, and release all resources.
 resource: instance, eip, etc...
       EOF
       def cleanup

data/lib/larrow/runner/manager.rb

@@ -77,7 +77,7 @@ module Larrow::Runner
 
     def store_resource
       resource = app.dump
-      File.write '.larrow.resource', YAML.dump(resource)
+      File.write ResourcePath, YAML.dump(resource)
       RunLogger.title 'store resource'
     end
 
@@ -102,6 +102,7 @@ module Larrow::Runner
       resource_iterator do |clazz, array|
         clazz.cleanup array
       end
+      File.delete ResourcePath rescue nil
       RunLogger.title 'resource cleaned'
     end
 

data/lib/larrow/runner/manifest/adapter/travis.rb

@@ -25,7 +25,7 @@ module Larrow::Runner
   
       def build_language
         return if data[:language].nil?
-        clazz = eval data[:language].camelize
+        clazz = eval data[:language].capitalize
         clazz.fulfill(data,configuration)
       end
     end

data/lib/larrow/runner/manifest/configuration.rb

@@ -81,9 +81,12 @@ module Larrow::Runner
         self.title = title
       end
   
-      def run_on node
+      def run_on node, verbose:nil
+        verbose = title.to_s.end_with?('test') if verbose.nil?
         scripts.each do |script|
-          node.execute script.actual_command, base_dir: script.base_dir
+          node.execute(script.actual_command, 
+                       base_dir: script.base_dir,
+                       verbose: verbose)
         end
       end
     end
@@ -99,7 +102,7 @@ module Larrow::Runner
         self.block = block
       end
       
-      def run_on node
+      def run_on node, *args
         block.call node
       end
     end

data/lib/larrow/runner/model/app.rb

@@ -16,12 +16,13 @@ module Larrow::Runner
       end
 
       def action group
+        verbose = RunOption.key?(:debug) ? true : nil
         configuration.steps_for(group) do |a_step|
           RunLogger.title "[#{a_step.title}]"
           begin_at = Time.new
-          a_step.run_on node
+          a_step.run_on node, verbose: verbose
           during = sprintf('%.2f',Time.new - begin_at)
-          RunLogger.level(1).detail "#{a_step.title} complete (#{during}s)"
+          RunLogger.level(1).info "#{a_step.title} complete (#{during}s)"
         end
       end
 

data/lib/larrow/runner/model/node.rb

@@ -14,7 +14,7 @@ module Larrow::Runner
         @executor = Executor.new host, user, nil, nil
       end
 
-      def execute command, base_dir:nil
+      def execute command, base_dir:nil,verbose:nil
         block = if block_given?
                   -> (data) { yield data }
                 else
@@ -24,7 +24,7 @@ module Larrow::Runner
                     end
                   }
                 end
-        @executor.execute command, base_dir: base_dir, &block
+        @executor.execute command, base_dir: base_dir, verbose:verbose, &block
       end
 
       def stop

data/lib/larrow/runner/service/cloud.rb

@@ -30,6 +30,8 @@ module Larrow
             RunLogger.level(1).detail "bind ip: #{eips[i].address}"
             eips[i] = eips[i].associate instances[i].id
             [ instances[i], eips[i] ]
+          end.tap do |list|
+            list.each{|instance,eip| ping eip.address,30}
           end
         end
 
@@ -54,6 +56,17 @@ module Larrow
           Qingcloud.remove_connection
           raise $!
         end
+        
+        def ping host, time, port=22
+          Timeout::timeout(time) do
+            loop do
+              if system("nmap #{host} -p #{port} -Pn | grep -q open")
+                return true
+              end
+            end
+          end
+        end
+
       end
     end
   end

data/lib/larrow/runner/service/executor.rb

@@ -15,13 +15,13 @@ module Larrow
           @dlogger = RunLogger #::Logger.new "#{ip}_cmd.log"
         end
 
-        def execute cmd, base_dir:nil
+        def execute cmd, base_dir:nil,verbose:nil
           connection.open_channel do |ch|
             RunLogger.level(1).detail "# #{cmd}"
             cmd = "cd #{base_dir}; #{cmd}" unless base_dir.nil?
             errmsg = ''
             ch.exec cmd do |ch,success|
-              if RunOption.key? :debug
+              if verbose
                 ch.on_data{ |c, data| yield data }
                 ch.on_extended_data{ |c, type, data| yield data }
               else

data/lib/larrow/runner/vcs/file_system.rb

@@ -27,7 +27,7 @@ module Larrow::Runner
       def update_source node, target_dir
         command = rsync_command node.user, node.host,target_dir
         invoke command
-        invoke "ssh-keygen -R #{node.host} 2>&1"
+        `ssh-keygen -R #{node.host} 2>&1 >/dev/null`
       end
 
       def rsync_command user, host, target_dir
@@ -40,19 +40,30 @@ module Larrow::Runner
           unshift('.git').                   # .git itself is ignored
           map{|s| "--exclude '#{s}'" }       # build rsync exclude arguments
 
-        ssh_options = "-e 'ssh -o StrictHostKeyChecking=no'"
-
-        rsync_options = "-az #{ssh_options} #{excludes.join ' '}"
+        rsync_options = "-az -e 'ssh #{ssh_options}' #{excludes.join ' '}"
         rsync_options += ' -v' if RunOption.key? :debug
 
-        "rsync #{rsync_options} #{project_folder}/ '#{ssh_path}' 2>&1"
+        "rsync #{rsync_options} #{project_folder}/ '#{ssh_path}'"
       end
+      
       def invoke command
-        `#{command}`.split(/\r?\n/).each do |msg|
-          RunLogger.level(1).info msg
+        RunLogger.level(1).info command
+        time = Time.new
+        `#{command} 2>&1`.split(/\r?\n/).each do |msg|
+          RunLogger.level(2).detail msg
         end
+        RunLogger.level(1).detail "invoke time: #{Time.new - time}"
       end
 
+      def ssh_options
+        {
+          'GSSAPIAuthentication'  => 'no',
+          'StrictHostKeyChecking' => 'no',
+          'LogLevel'              => 'ERROR'
+        }.map do |k,v|
+          "-o #{k}=#{v}" 
+        end.join(' ')
+      end
     end
   end
 end

data/lib/larrow/runner/version.rb

@@ -1,5 +1,5 @@
 module Larrow
   module Runner
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

data/spec/{manifest → unit_test/manifest}/travis_spec.rb

@@ -1,4 +1,4 @@
-require_relative '../spec_helper.rb'
+require_relative '../../spec_helper.rb'
 
 module Larrow::Runner::Manifest
   describe Travis do
@@ -9,7 +9,7 @@ module Larrow::Runner::Manifest
       end
 
       def get _filename
-        path = File.expand_path "../../fixtures/#{filename}", __FILE__
+        path = File.expand_path "../../../fixtures/#{filename}", __FILE__
         File.read(path)
       end
 

data/spec/{model → unit_test/model}/node_spec.rb

@@ -1,15 +1,15 @@
-require_relative '../spec_helper.rb'
+require_relative '../../spec_helper.rb'
 
 module Larrow::Runner::Model
   describe Node do
     subject{ Node.new nil, OpenStruct.new(address: 'localhost'), `whoami`.chomp }
     before do 
-      Larrow::Runner::RunOption[:debug] = nil
+      Larrow::Runner::RunOption[:debug] = true
     end
     it 'can execute' do
       outputs = ""
       script = OpenStruct.new(actual_command: 'pwd')
-      subject.execute('pwd') do |data|
+      subject.execute('pwd',verbose:true) do |data|
         outputs << data
       end
       expect(outputs).to include(ENV['HOME'])

data/spec/{service → unit_test/service}/executor_spec.rb

@@ -1,19 +1,16 @@
-require_relative '../spec_helper.rb'
+require_relative '../../spec_helper.rb'
 module Larrow::Runner::Service
   describe Executor do
     subject{ Executor.new 'localhost', `whoami`.chomp, 22, nil }
-    before do 
-      Larrow::Runner::RunOption[:debug] = nil
-    end
     it 'normal command run'do
       outputs = ''
-      subject.execute('echo aaa'){|data| outputs << data}
+      subject.execute('echo aaa',verbose:true){|data| outputs << data}
       expect(outputs).to eq "aaa\n"
     end
 
     it 'command with base dir' do
       outputs = ''
-      subject.execute('pwd', base_dir: '/opt') do |data|
+      subject.execute('pwd', base_dir: '/opt',verbose:true) do |data|
         outputs << data
       end
       expect(outputs).to eq "/opt\n"

data/spec/{vcs → unit_test/vcs}/github_spec.rb

@@ -1,4 +1,4 @@
-require_relative '../spec_helper.rb'
+require_relative '../../spec_helper.rb'
 module Larrow
   module Runner
     module Vcs

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: larrow-runner
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - fsword
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-18 00:00:00.000000000 Z
+date: 2014-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -182,14 +182,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.2
 - !ruby/object:Gem::Dependency
   name: promising
   requirement: !ruby/object:Gem::Requirement
@@ -218,17 +224,15 @@ files:
 - Gemfile
 - LICENSE.txt
 - README.md
+- RELEASE
 - Rakefile
 - bin/larrow
 - larrow-runner.gemspec
 - lib/active_support/core_ext/hash.rb
-- lib/active_support/core_ext/hash/compact.rb
-- lib/active_support/core_ext/hash/deep_merge.rb
-- lib/active_support/core_ext/hash/except.rb
 - lib/active_support/core_ext/hash/indifferent_access.rb
 - lib/active_support/core_ext/hash/keys.rb
-- lib/active_support/core_ext/hash/reverse_merge.rb
-- lib/active_support/core_ext/hash/slice.rb
+- lib/active_support/core_ext/string.rb
+- lib/active_support/core_ext/string/indent.rb
 - lib/active_support/hash_with_indifferent_access.rb
 - lib/larrow/runner.rb
 - lib/larrow/runner/cli.rb
@@ -260,11 +264,11 @@ files:
 - spec/fixtures/travis_ruby.yml
 - spec/integration/build_cmds_spec.rb
 - spec/integration/test_cmds_spec.rb
-- spec/manifest/travis_spec.rb
-- spec/model/node_spec.rb
-- spec/service/executor_spec.rb
 - spec/spec_helper.rb
-- spec/vcs/github_spec.rb
+- spec/unit_test/manifest/travis_spec.rb
+- spec/unit_test/model/node_spec.rb
+- spec/unit_test/service/executor_spec.rb
+- spec/unit_test/vcs/github_spec.rb
 homepage: http://github.com/fsword/larrow-core
 licenses:
 - MIT
@@ -294,8 +298,8 @@ test_files:
 - spec/fixtures/travis_ruby.yml
 - spec/integration/build_cmds_spec.rb
 - spec/integration/test_cmds_spec.rb
-- spec/manifest/travis_spec.rb
-- spec/model/node_spec.rb
-- spec/service/executor_spec.rb
 - spec/spec_helper.rb
-- spec/vcs/github_spec.rb
+- spec/unit_test/manifest/travis_spec.rb
+- spec/unit_test/model/node_spec.rb
+- spec/unit_test/service/executor_spec.rb
+- spec/unit_test/vcs/github_spec.rb

data/lib/active_support/core_ext/hash/compact.rb

@@ -1,20 +0,0 @@
-class Hash
-  # Returns a hash with non +nil+ values.
-  # 
-  #   hash = { a: true, b: false, c: nil}
-  #   hash.compact # => { a: true, b: false}
-  #   hash # => { a: true, b: false, c: nil}
-  #   { c: nil }.compact # => {}
-  def compact
-    self.select { |_, value| !value.nil? }
-  end
-  
-  # Replaces current hash with non +nil+ values.
-  # 
-  #   hash = { a: true, b: false, c: nil}
-  #   hash.compact! # => { a: true, b: false}
-  #   hash # => { a: true, b: false}
-  def compact!
-    self.reject! { |_, value| value.nil? }
-  end
-end

data/lib/active_support/core_ext/hash/deep_merge.rb

@@ -1,38 +0,0 @@
-class Hash
-  # Returns a new hash with +self+ and +other_hash+ merged recursively.
-  #
-  #   h1 = { a: true, b: { c: [1, 2, 3] } }
-  #   h2 = { a: false, b: { x: [3, 4, 5] } }
-  #
-  #   h1.deep_merge(h2) #=> { a: false, b: { c: [1, 2, 3], x: [3, 4, 5] } }
-  #
-  # Like with Hash#merge in the standard library, a block can be provided
-  # to merge values:
-  #
-  #   h1 = { a: 100, b: 200, c: { c1: 100 } }
-  #   h2 = { b: 250, c: { c1: 200 } }
-  #   h1.deep_merge(h2) { |key, this_val, other_val| this_val + other_val }
-  #   # => { a: 100, b: 450, c: { c1: 300 } }
-  def deep_merge(other_hash, &block)
-    dup.deep_merge!(other_hash, &block)
-  end
-
-  # Same as +deep_merge+, but modifies +self+.
-  def deep_merge!(other_hash, &block)
-    other_hash.each_pair do |current_key, other_value|
-      this_value = self[current_key]
-
-      self[current_key] = if this_value.is_a?(Hash) && other_value.is_a?(Hash)
-        this_value.deep_merge(other_value, &block)
-      else
-        if block_given? && key?(current_key)
-          block.call(current_key, this_value, other_value)
-        else
-          other_value
-        end
-      end
-    end
-
-    self
-  end
-end

data/lib/active_support/core_ext/hash/except.rb

@@ -1,15 +0,0 @@
-class Hash
-  # Returns a hash that includes everything but the given keys. This is useful for
-  # limiting a set of parameters to everything but a few known toggles:
-  #
-  #   @person.update(params[:person].except(:admin))
-  def except(*keys)
-    dup.except!(*keys)
-  end
-
-  # Replaces the hash without the given keys.
-  def except!(*keys)
-    keys.each { |key| delete(key) }
-    self
-  end
-end

data/lib/active_support/core_ext/hash/reverse_merge.rb

@@ -1,22 +0,0 @@
-class Hash
-  # Merges the caller into +other_hash+. For example,
-  #
-  #   options = options.reverse_merge(size: 25, velocity: 10)
-  #
-  # is equivalent to
-  #
-  #   options = { size: 25, velocity: 10 }.merge(options)
-  #
-  # This is particularly useful for initializing an options hash
-  # with default values.
-  def reverse_merge(other_hash)
-    other_hash.merge(self)
-  end
-
-  # Destructive +reverse_merge+.
-  def reverse_merge!(other_hash)
-    # right wins if there is no left
-    merge!( other_hash ){|key,left,right| left }
-  end
-  alias_method :reverse_update, :reverse_merge!
-end

data/lib/active_support/core_ext/hash/slice.rb

@@ -1,42 +0,0 @@
-class Hash
-  # Slice a hash to include only the given keys. This is useful for
-  # limiting an options hash to valid keys before passing to a method:
-  #
-  #   def search(criteria = {})
-  #     criteria.assert_valid_keys(:mass, :velocity, :time)
-  #   end
-  #
-  #   search(options.slice(:mass, :velocity, :time))
-  #
-  # If you have an array of keys you want to limit to, you should splat them:
-  #
-  #   valid_keys = [:mass, :velocity, :time]
-  #   search(options.slice(*valid_keys))
-  def slice(*keys)
-    keys.map! { |key| convert_key(key) } if respond_to?(:convert_key, true)
-    keys.each_with_object(self.class.new) { |k, hash| hash[k] = self[k] if has_key?(k) }
-  end
-
-  # Replaces the hash with only the given keys.
-  # Returns a hash containing the removed key/value pairs.
-  #
-  #   { a: 1, b: 2, c: 3, d: 4 }.slice!(:a, :b)
-  #   # => {:c=>3, :d=>4}
-  def slice!(*keys)
-    keys.map! { |key| convert_key(key) } if respond_to?(:convert_key, true)
-    omit = slice(*self.keys - keys)
-    hash = slice(*keys)
-    hash.default      = default
-    hash.default_proc = default_proc if default_proc
-    replace(hash)
-    omit
-  end
-
-  # Removes and returns the key/value pairs matching the given keys.
-  #
-  #   { a: 1, b: 2, c: 3, d: 4 }.extract!(:a, :b) # => {:a=>1, :b=>2}
-  #   { a: 1, b: 2 }.extract!(:a, :x)             # => {:a=>1}
-  def extract!(*keys)
-    keys.each_with_object(self.class.new) { |key, result| result[key] = delete(key) if has_key?(key) }
-  end
-end