inprovise 0.2.3 → 0.2.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    M2I3MjliY2U3MTAzZDM4NzA2ZTRmZmVmOGQ0ZmUxZTNkMzA5NmYyOA==
+    MjA2NmY3ZWEzYjMzZWZhN2NiZTQ1MTkzODNlMjFhZmMyZDA5MzYzMQ==
   data.tar.gz: !binary |-
-    ODQyNTljNDc5YzVhMDFlNDdhYWU1YWMyYzdiNjVlZDY3M2NiMTMyMA==
+    YzMxY2Q2NzNiMmYyZjg4YjRlOTFhNDBlNmM0YTZiNzM5OTg5ZDNhNg==
 SHA512:
   metadata.gz: !binary |-
-    N2UyMGU2ZmY0ZjQzNTkwZmNkMjhjNTY1YTI4ZmI2OGFhNzkyNTQ4MjEwMWQy
-    YWU0YjNhOTliMjE4YzU0Y2ViNTE4MWUyNjFkNzE0MGQyMWUzNDQxNDJmMjQ1
-    NGNiYzJjZjg1NjE0NmI5YmM4ZjY3ZGFjMjBhYTc4ZDUyOWRhNzU=
+    ZDk2Nzc2ZDZlYjhjNjFiMmM0NzdiMDFiOWNmNjIyYWNlOTdjMDViOTQxOGRi
+    ZjQwMGUwYWZmYzU0YjBmZTI0MjZmZjE2NjAyZjQwMGEzNmMyODk5ZjRjOWQ4
+    MDgwNjBiNzZlYTBiNTQxYjUyNDUzMWViODQwNGI0Y2QzMTZjZTE=
   data.tar.gz: !binary |-
-    NjM3YjZlYmYxY2JjZTYwZDRjN2JmY2I4Y2QwYTNkZDcwZTRjYmMzZTQyMjFi
-    NzJhNGZkNjc2NzE3ZTcxZWRjZTE5ZWM3ODVjMjU4Mzg3MDAzNDU2ODZlOTgy
-    ZDZlZTgzMzRhNTU5MjQ1YTc0ZmRhMGJiMTg1NGUyMjkyZjhlZjE=
+    YjA0ZWY1YmJmODJjMjhlZTIzYmJhYzE0OTMzNTMyMmE4NjkwN2E2OGUyMjcy
+    MzdkZDQxODMwZDNiOTNhOTlkYTcyMGQ2NGQ3ZGIzNDc5MmFiNWI5ZDFhNGZm
+    Y2ZhYWYwYzEwZDRhZWE0NzAwODUzNDYzMDYyMTk3Y2I5ZjI0ZTI=

data/lib/inprovise/cmd_helper.rb

@@ -119,6 +119,10 @@ module Inprovise::CmdHelper
     nil
   end
 
+  def move(from, to)
+    nil
+  end
+
   def delete(path)
     nil
   end

data/lib/inprovise/execution_context.rb

@@ -183,8 +183,12 @@ class Inprovise::ExecutionContext
     @node.copy(from, to)
   end
 
+  def move(from, to)
+    @node.move(from, to)
+  end
+
   def local(path)
-    Inprovise::LocalFile.new(path)
+    Inprovise::LocalFile.new(self, path)
   end
 
   def remote(path)

data/lib/inprovise/group.rb

@@ -61,7 +61,7 @@ class Inprovise::Infrastructure::Group < Inprovise::Infrastructure::Target
   end
 
   def self.json_create(o)
-    data = o[:data]
-    new(data[:name], data[:config], data[:targets])
+    data = o['data']
+    new(data['name'], Inprovise::Infrastructure.symbolize_keys(data['config']), data['targets'])
   end
 end

data/lib/inprovise/helper/linux.rb

@@ -41,6 +41,8 @@ Inprovise::CmdHelper.define('linux') do
   def sudo
     return self if @exec == :sudo_run
     @sudo ||= self.class.new(@channel, true)
+    @sudo.set_cwd(@cwd)
+    @sudo
   end
 
   # file management
@@ -83,7 +85,7 @@ Inprovise::CmdHelper.define('linux') do
     begin
       @channel.exists?(path)
     rescue
-      exec(%{if [ -f #{path} ]; then echo "true"; else echo "false"; fi}).strip == 'true'
+      exec(%{if [ -f #{path} ]; then echo true; else echo false; fi}).strip == 'true'
     end
   end
 
@@ -109,6 +111,10 @@ Inprovise::CmdHelper.define('linux') do
     exec("cp #{real_path(from)} #{real_path(to)}")
   end
 
+  def move(from, to)
+    exec("mv #{real_path(from)} #{real_path(to)}")
+  end
+
   def delete(path)
     path = real_path(path)
     begin
@@ -175,7 +181,7 @@ Inprovise::CmdHelper.define('linux') do
   end
 
   def sudo_run(cmd, forcelog=false)
-    @channel.run("sudo #{cmd}", forcelog)
+    @channel.run(%{sudo sh -c "#{cmd}"}, forcelog)
   end
 
 end

data/lib/inprovise/helper/windows.rb

@@ -74,6 +74,10 @@ Inprovise::CmdHelper.define('windows') do
     run("copy #{from} #{to}")
   end
 
+  def move(from, to)
+    run("rename #{from} #{to}")
+  end
+
   def delete(path)
     begin
       @channel.delete(path)

data/lib/inprovise/infra.rb

@@ -9,8 +9,12 @@ require 'monitor'
 module Inprovise::Infrastructure
 
   # setup JSON parameters
-  JSON.load_default_options[:symbolize_names] = true
-  JSON.create_id = :json_class
+  JSON.create_id = 'json_class'
+
+  def self.symbolize_keys(hsh)
+    return hsh unless Hash === hsh
+    hsh.reduce({}) {|h, (k,v)| h[k.to_sym] = symbolize_keys(v); h }
+  end
 
   class << self
     def targets

data/lib/inprovise/local_file.rb

@@ -10,7 +10,8 @@ require 'etc'
 class Inprovise::LocalFile
   attr_reader :path
 
-  def initialize(path)
+  def initialize(context, path)
+    @context = context
     @path = resolve(path)
   end
 
@@ -50,19 +51,31 @@ class Inprovise::LocalFile
   end
 
   def copy_to(destination)
+    destination = self.class.new(destination) if String === destination
     if destination.is_local?
       duplicate(destination)
     else
       upload(destination)
     end
+  end
+
+  def move_to(destination)
+    destination = self.class.new(destination) if String === destination
+    if destination.is_local?
+      FileUtils.mv(path, destination.path)
+    else
+      upload(destination)
+    end
     destination
   end
 
   def copy_from(source)
+    source = self.class.new(source) if String === source
     source.copy_to(self)
   end
 
   def duplicate(destination)
+    destination = self.class.new(destination) if String === destination
     FileUtils.cp(path, destination.path)
     destination
   end
@@ -70,7 +83,7 @@ class Inprovise::LocalFile
   def upload(destination)
     destination = @context.remote(destination) if String === destination
     if destination.is_local?
-      FileUtils.cp(path, destination.path)
+      duplicate(destination)
     else
       destination.upload(self)
     end

data/lib/inprovise/node.rb

@@ -126,6 +126,11 @@ class Inprovise::Infrastructure::Node < Inprovise::Infrastructure::Target
     helper.copy(from, to)
   end
 
+  def move(from, to)
+    log.execute("MOVE: #{from} #{to}") if Inprovise.verbosity > 0
+    helper.move(from, to)
+  end
+
   def delete(path)
     log.execute("DELETE: #{path}") if Inprovise.verbosity > 0
     helper.delete(path)
@@ -228,8 +233,8 @@ class Inprovise::Infrastructure::Node < Inprovise::Infrastructure::Target
   end
 
   def self.json_create(o)
-    data = o[:data]
-    new(data[:name], data[:config])
+    data = o['data']
+    new(data['name'], Inprovise::Infrastructure.symbolize_keys(data['config']))
   end
 
   private

data/lib/inprovise/remote_file.rb

@@ -45,35 +45,49 @@ class Inprovise::RemoteFile
   end
 
   def copy_to(destination)
+    destination = @context.remote(destination) if String === destination
     if destination.is_local?
       download(destination)
     else
       duplicate(destination)
     end
+  end
+
+  def move_to(destination)
+    destination = @context.remote(destination) if String === destination
+    if destination.is_local?
+      download(destination)
+    else
+      @context.move(path, destination.path)
+    end
     destination
   end
 
-  def copy_from(destination)
-    destination.copy_to(self)
+  def copy_from(source)
+    source = @context.remote(source) if String === source
+    source.copy_to(self)
   end
 
   def duplicate(destination)
+    destination = @context.remote(destination) if String === destination
     @context.copy(path, destination.path)
     destination
   end
 
   def download(destination)
-    if String === destination || destination.is_local?
-      @context.download(path, String === destination ? destination : destination.path)
+    destination = @context.local(destination) if String === destination
+    if destination.is_local?
+      @context.download(path, destination.path)
     else
       @context.copy(path, destination.path)
     end
-    String === destination ? @context.local(destination) : destination
+    destination
   end
 
   def upload(source)
-    if String === source || source.is_local?
-      @context.upload(String === source ? source : source.path, path)
+    source = @context.local(source) if String === source
+    if source.is_local?
+      @context.upload(source.path, path)
     else
       @context.copy(source.path, path)
     end

data/lib/inprovise/version.rb

@@ -5,6 +5,6 @@
 
 module Inprovise
 
-  VERSION = '0.2.3'
+  VERSION = '0.2.4'
 
 end

data/test/local_file_test.rb

@@ -7,8 +7,15 @@ require_relative 'test_helper'
 
 describe Inprovise::LocalFile do
   before :each do
+    @node = Inprovise::Infrastructure::Node.new('Node1', {host: 'host.address.net', channel: 'test', helper: 'test'})
+    @log = Inprovise::Logger.new(@node, 'remote_file_test')
+    @context = Inprovise::ExecutionContext.new(@node, @log, Inprovise::ScriptIndex.default)
     @local_file_path = File.join(File.dirname(__FILE__), 'fixtures', 'example.txt')
-    @local_file = Inprovise::LocalFile.new(@local_file_path)
+    @local_file = Inprovise::LocalFile.new(@context, @local_file_path)
+  end
+
+  after :each do
+    reset_infrastructure!
   end
 
   describe 'path' do
@@ -36,7 +43,7 @@ describe Inprovise::LocalFile do
   end
 
   describe 'copy_to' do
-    before(:each) { @destination = Inprovise::LocalFile.new("/tmp/example-#{Time.now.to_i}.txt") }
+    before(:each) { @destination = Inprovise::LocalFile.new(@context, "/tmp/example-#{Time.now.to_i}.txt") }
     after(:each)  { @destination.delete! }
 
     it 'copies a file to another local location' do

data/test/remote_file_test.rb

@@ -10,9 +10,9 @@ describe Inprovise::RemoteFile do
     @node = Inprovise::Infrastructure::Node.new('Node1', {host: 'host.address.net', channel: 'test', helper: 'test'})
     @log = Inprovise::Logger.new(@node, 'remote_file_test')
     @local_file_path = File.join(File.dirname(__FILE__), 'fixtures', 'example.txt')
-    @local_file = Inprovise::LocalFile.new(@local_file_path)
     @remote_file_path = '/tmp/example.txt'
     @context = Inprovise::ExecutionContext.new(@node, @log, Inprovise::ScriptIndex.default)
+    @local_file = Inprovise::LocalFile.new(@context, @local_file_path)
     @remote_file = Inprovise::RemoteFile.new(@context, @remote_file_path)
   end
 
@@ -67,7 +67,7 @@ describe Inprovise::RemoteFile do
     end
 
     it 'copies a file to local location by downlaoding it' do
-      @local_destination = Inprovise::LocalFile.new("/tmp/example-#{Time.now.to_i}.txt")
+      @local_destination = Inprovise::LocalFile.new(@context, "/tmp/example-#{Time.now.to_i}.txt")
       @node.helper.expects(:download)
                   .with(@remote_file.path, @local_destination.path)
                   .returns(nil)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inprovise
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Martin Corino