prep_kit 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8aece43efa7604a3983c8741ebb2c8d3dc05a997
-  data.tar.gz: 0318267847286b7ab85dc846deaa8178a57cea01
+  metadata.gz: 8cd5f08170c8218f60129bdb66d94ad714ee2a16
+  data.tar.gz: ea53500e04585df087780ed5373829405c239be7
 SHA512:
-  metadata.gz: 11420f4db9299d064c57ed9e589f0b664a575ad959a1dad6f113474a5f887bf9fa402a5b2c4178ed8d11e59e63e8b984b460ca818a67d04c92c9a033931361fe
-  data.tar.gz: fd83533c6754ce98a7d3d5bf8a4682193c71fca1af57ee14d41bf04f398db48e95ae792c51267d368bf297311b324cdb4501df439dd7dc3edf71731af965259c
+  metadata.gz: b25f05441760238e487da7f3b3699ddf473a91441ac6df841dbcec6a6445daf58c8b80de8ee9f63d22b399f3de3ad851aae89b61ee73606a3daad1fe91a01fbc
+  data.tar.gz: 427de6267edb65f24ca6302ce27158a57add8edcb8caeb704599ee55ec740df7ffb5718457e3621c436797e22965145d006129ecc65007dd5f765915396d2cb6

data/Gemfile.lock

@@ -1,34 +1,19 @@
 PATH
   remote: .
   specs:
-    prep_kit (0.1.7)
-      remote_marshal
+    prep_kit (0.1.8)
+      colorize
+      net-scp
+      net-ssh
 
 GEM
   remote: https://rubygems.org/
   specs:
-    file-tail (1.1.0)
-      tins (~> 1.0)
+    colorize (0.7.7)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
     net-ssh (3.0.2)
     rake (10.4.2)
-    remote_marshal (0.1.9)
-      net-scp
-      net-ssh
-      sourcify
-    ruby2ruby (2.2.0)
-      ruby_parser (~> 3.1)
-      sexp_processor (~> 4.0)
-    ruby_parser (3.7.3)
-      sexp_processor (~> 4.1)
-    sexp_processor (4.6.1)
-    sourcify (0.5.0)
-      file-tail (>= 1.0.5)
-      ruby2ruby (>= 1.2.5)
-      ruby_parser (>= 2.0.5)
-      sexp_processor (>= 3.0.5)
-    tins (1.8.2)
 
 PLATFORMS
   ruby

data/lib/prep_kit/context.rb

@@ -2,7 +2,7 @@ module PrepKit
   class Context
     def initialize(host, user, options = {})
       @vars     = {}
-      @env      = RemoteMarshal.new(host, user, options)
+      @env      = environment(host, user, options)
       @memoized = {}
     end
 
@@ -23,33 +23,42 @@ module PrepKit
     end
 
     def sh(command)
-      PrepKit.logger.info "sh: #{command}"
+      PrepKit.logger.info "sh: ".bold + command.underline
 
-      output = @memoized.fetch(command) do
-        status, output, error = @env.exec!(command)
+      status = @memoized.fetch(command) do
+        @memoized[command] = :skip
 
-        raise RuntimeError, error unless status == 0
-
-        @memoized[command] = '[SKIP]'
-
-        "<- \n" + output
+        @env.exec!(command) == 0 ? :success : :failure
       end
 
-      output.tap { |output| PrepKit.logger.info output }
+      raise RuntimeError, command if status == :failure
+
+      status
     end
 
     def test?(path, option)
-      status, *_ = @env.test?(path, option)
-
-      status == 0
+      @env.test?(path, option) == 0
     end
 
     %i(upload download).each do |name|
       define_method(name) do |src, dst|
-        PrepKit.logger.info "#{name}: #{src} #{dst}"
+        PrepKit.logger.info "#{name}: ".bold + "#{src} #{dst}".underline
 
         @env.public_send("#{name}!", src, dst)
       end
     end
+
+    private
+
+    def environment(host, user, options)
+      Remote.new(host, user, options) do |type, data|
+        case type
+        when :output
+          PrepKit.info  data.colorize(:green)
+        when :error
+          PrepKit.error data.colorize(:red)
+        end
+      end
+    end
   end
 end

data/lib/prep_kit/remote.rb

@@ -0,0 +1,54 @@
+module PrepKit
+  class Remote
+    def initialize(host, user, options, &callback)
+      @ssh = create_ssh(host, user, options, &callback)
+    end
+
+    def exec!(command)
+      @ssh.call(command)
+    end
+
+    %i(upload! download!).each do |name|
+      define_method(name) do |src, dst|
+        @ssh.call { |ssh| ssh.scp.public_send(name, src, dst) }
+      end
+    end
+
+    def test?(name, option = nil)
+      exec!(%([ #{option} #{name} ]))
+    end
+
+    private
+
+    def create_ssh(host, user, options, &callback)
+      lambda do |command|
+        status = nil
+
+        Net::SSH.start(host, user, options) do |ssh|
+          channel = ssh.open_channel do |chan|
+            chan.exec command do |ch, success|
+              raise RuntimeError command unless success
+
+              ch.on_data do |_, data|
+                callback.(:output, data)
+              end
+
+              ch.on_extended_data do |_, _, data|
+                callback.(:error, data)
+              end
+
+              ch.on_request('exit-status') do |_, data|
+                status = data.read_long
+              end
+            end
+          end
+
+          channel.wait
+          ssh.loop
+        end
+
+        status
+      end
+    end
+  end
+end

data/lib/prep_kit/task.rb

@@ -21,7 +21,7 @@ module PrepKit
     end
 
     def within(directory, &block)
-      PrepKit.logger.info "within: #{directory}"
+      PrepKit.logger.info "within: ".bold + directory.underline
 
       raise RuntimeError, directory unless test?(directory, '-d')
 

data/lib/prep_kit/version.rb

@@ -1,3 +1,3 @@
 module PrepKit
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end

data/lib/prep_kit.rb

@@ -1,7 +1,10 @@
 require 'logger'
-require 'remote_marshal'
+require 'net/ssh'
+require 'net/scp'
+require 'colorize'
 
 require 'prep_kit/version'
+require 'prep_kit/remote'
 require 'prep_kit/context'
 require 'prep_kit/task'
 require 'prep_kit/within'

data/prep_kit.gemspec

@@ -18,7 +18,9 @@ Gem::Specification.new do |spec|
                        end
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency 'remote_marshal'
+  spec.add_runtime_dependency 'net-ssh'
+  spec.add_runtime_dependency 'net-scp'
+  spec.add_runtime_dependency 'colorize'
 
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,17 +1,45 @@
 --- !ruby/object:Gem::Specification
 name: prep_kit
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - daisuko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-12 00:00:00.000000000 Z
+date: 2016-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: remote_marshal
+  name: net-ssh
+  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: net-scp
+  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: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -72,6 +100,7 @@ files:
 - lib/prep_kit.rb
 - lib/prep_kit/context.rb
 - lib/prep_kit/formatter.rb
+- lib/prep_kit/remote.rb
 - lib/prep_kit/task.rb
 - lib/prep_kit/version.rb
 - lib/prep_kit/with.rb