pd-blender 0.1.0 → 0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4755355532133b48f4e4525b8a7671206318b470
-  data.tar.gz: 416b8fd419f08c1900b9f08cca300b7703d4ed68
+  metadata.gz: 5d2a8ce92f7b3b1e822aef383d7b8877be17b289
+  data.tar.gz: d6e102dfd4f9d92ef2c2a6e619f490597846bc05
 SHA512:
-  metadata.gz: 7822a210909825f27e67a8887083ac2a3521ef3d465efcdcd3e45dd7b61da3551df7ad59fe480dcbe9875ee6bc77261d3ced3a157b744055d02c4e6c336b08e3
-  data.tar.gz: 07c515f06d1ae9d67360e264c95e2be947cac421ca9319fefdbb1c08f26258a468466ff7976fbb9fff7d3bdc5467e28447fdaa5834858116c7edb85457a4d8b6
+  metadata.gz: 540d5d79754dc7edaca79ad4882a73e2f16badd2dd2dcc3a2cdff5da055d722993b783536c4a9bb9b0f8b5b0098ef56adf351e5437e39234915353f98dd0b83b
+  data.tar.gz: 0a8af7f7576af424751136e9f4aee4709e3c9376e58f43ef4eb649d5d2ddd332f3b6526e513a60367ad69e388365f1e8bce2a75c35ce98e7969bc80f0d8392f6

data/lib/blender/drivers/scp.rb

@@ -50,10 +50,10 @@ module Blender
         begin
           case command.direction
           when :upload
-            session.scp.upload!(command.source, command.target)
+            session.scp.upload!(command.source, command.target, command.options)
             ExecOutput.new(0, '', '')
           when :download
-            session.scp.download!(command.source, command.target)
+            session.scp.download!(command.source, command.target, command.options)
             ExecOutput.new(0, '', '')
           else
             ExecOutput.new(-1, '' , "Invalid direction. Can be either :upload or :download. Found:'#{command.direction}'")

data/lib/blender/tasks/scp.rb

@@ -22,20 +22,37 @@ module Blender
   module Task
     class Scp < Blender::Task::Base
       extend Forwardable
+
       def_delegators :@command, :direction, :direction=
+
       def initialize(name, metadata = {})
         super
-        @command = Struct.new(:direction, :source, :target).new
+        @command = Struct.new(:direction, :source, :target, :options).new
         @command.target = name
         @command.source = name
+        @command.options = {}
         @direction = :upload
       end
+
       def from(source)
         @command.source = source
       end
+
       def to(target)
         @command.target = target
       end
+
+      def recursive(val)
+        @command.options[:recursive] = val
+      end
+
+      def preserve(val)
+        @command.options[:preserve] = val
+      end
+
+      def chunk_size(val)
+        @command.options[:chunk_size] = val
+      end
     end
   end
 end

data/lib/blender/version.rb

@@ -16,5 +16,5 @@
 # limitations under the License.
 
 module Blender
-  VERSION = '0.1.0'
+  VERSION = '0.2'
 end

data/spec/blender/drivers/scp_spec.rb

@@ -0,0 +1,33 @@
+require 'spec_helper'
+
+describe Blender do
+  it 'passes scp options' do
+    scp = double('Net::SCP')
+    session = double('Net::SSH::Session', scp: scp, loop: true)
+    expect(Net::SSH).to receive(:start).with('1.2.3.4', 'test-user', password: 'test-password').and_return(session)
+    expect(scp).to receive(:upload!).with('/tmp/from', '/tmp/to', recursive: true)
+    sched = Blender.blend('scp', no_doc: true) do |sched|
+      sched.config(:scp, user: 'test-user', password: 'test-password')
+      sched.members(['1.2.3.4'])
+      sched.scp_upload 'foo' do
+        recursive true
+        from '/tmp/from'
+        to '/tmp/to'
+      end
+    end
+  end
+  it '#download' do
+    session = double('Net::SSH::Session', loop: true)
+    scp = double('Net::SSH::Scp')
+    expect(Net::SSH).to receive(:start).with('host1', 'x', password: 'y').and_return(session)
+    expect(session).to receive(:scp).and_return(scp)
+    expect(scp).to receive(:download!).with('/remote/path', '/local/path', {})
+    Blender.blend('test') do |sched|
+      sched.members(['host1'])
+      sched.config(:scp, user: 'x', password: 'y')
+      sched.scp_download '/remote/path' do
+        to '/local/path'
+      end
+    end
+  end
+end

data/spec/blender/dsl_spec.rb

@@ -16,35 +16,4 @@ describe '#dsl' do
     allow_any_instance_of(Blender::Driver::Ssh).to receive(:execute)
     scheduler.run
   end
-
-  context '#scp' do
-    it '#upload' do
-      session = double('Net::SSH::Session', loop: true)
-      scp = double('Net::SSH::Scp')
-      expect(Net::SSH).to receive(:start).with('host1', 'x', password: 'y').and_return(session)
-      expect(session).to receive(:scp).and_return(scp)
-      expect(scp).to receive(:upload!).with('/local/path', '/remote/path')
-      Blender.blend('test') do |sched|
-        sched.config(:scp, user: 'x', password: 'y')
-        sched.members(['host1'])
-        sched.scp_upload '/remote/path' do
-          from '/local/path'
-        end
-      end
-    end
-    it '#download' do
-      session = double('Net::SSH::Session', loop: true)
-      scp = double('Net::SSH::Scp')
-      expect(Net::SSH).to receive(:start).with('host1', 'x', password: 'y').and_return(session)
-      expect(session).to receive(:scp).and_return(scp)
-      expect(scp).to receive(:download!).with('/remote/path', '/local/path')
-      Blender.blend('test') do |sched|
-        sched.members(['host1'])
-        sched.config(:scp, user: 'x', password: 'y')
-        sched.scp_download '/remote/path' do
-          to '/local/path'
-        end
-      end
-    end
-  end
 end

data/spec/blender/tasks/scp_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+
+describe Blender do
+  it 'passes scp options' do
+    sched = Blender::Scheduler.new('scp')
+    sched.scp_upload 'foo' do
+      recursive true
+      from '/tmp/from'
+      to '/tmp/to'
+    end
+    task = sched.tasks.first
+    expect(task.command.target).to eq('/tmp/to')
+    expect(task.command.source).to eq('/tmp/from')
+    expect(task.command.options[:recursive]).to eq(true)
+    expect(task.command.direction).to eq(:upload)
+  end
+end

data/spec/spec_helper.rb

@@ -5,6 +5,7 @@ require 'rspec/expectations'
 require 'blender'
 require 'blender/scheduling_strategies/per_host'
 require 'blender/scheduling_strategies/per_task'
+require 'pry'
 
 module SpecHelper
   def create_task(name, driver = nil)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pd-blender
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: '0.2'
 platform: ruby
 authors:
 - Ranjib Dey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-02 00:00:00.000000000 Z
+date: 2015-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -264,6 +264,7 @@ files:
 - spec/blender/blender_rspec.rb
 - spec/blender/config_spec.rb
 - spec/blender/discovery_spec.rb
+- spec/blender/drivers/scp_spec.rb
 - spec/blender/drivers/ssh_multi_spec.rb
 - spec/blender/drivers/ssh_spec.rb
 - spec/blender/dsl_spec.rb
@@ -273,6 +274,7 @@ files:
 - spec/blender/scheduled_job_spec.rb
 - spec/blender/scheduler_spec.rb
 - spec/blender/scheduling_strategies/default_spec.rb
+- spec/blender/tasks/scp_spec.rb
 - spec/blender/utils/refinements_spec.rb
 - spec/blender/utils/thread_pool_spec.rb
 - spec/blender_spec.rb
@@ -306,6 +308,7 @@ test_files:
 - spec/blender/blender_rspec.rb
 - spec/blender/config_spec.rb
 - spec/blender/discovery_spec.rb
+- spec/blender/drivers/scp_spec.rb
 - spec/blender/drivers/ssh_multi_spec.rb
 - spec/blender/drivers/ssh_spec.rb
 - spec/blender/dsl_spec.rb
@@ -315,6 +318,7 @@ test_files:
 - spec/blender/scheduled_job_spec.rb
 - spec/blender/scheduler_spec.rb
 - spec/blender/scheduling_strategies/default_spec.rb
+- spec/blender/tasks/scp_spec.rb
 - spec/blender/utils/refinements_spec.rb
 - spec/blender/utils/thread_pool_spec.rb
 - spec/blender_spec.rb