rspec-system 0.3.0 → 0.3.1

data/lib/rspec-system/helpers.rb

@@ -168,15 +168,13 @@ module RSpecSystem::Helpers
     dp = options[:dp]
 
     log.info("system_rcp from #{sp} to #{d.name}:#{dp} executed")
-    status, stdout, stderr = results = rspec_system_node_set.rcp(options)
+    results = rspec_system_node_set.rcp(options)
     log.info("rcp results:\n" +
       "-----------------------\n" +
-      "Exit Status: #{status.exitstatus}\n" +
-      "<stdout>#{stdout}</stdout>\n" +
-      "<stderr>#{stderr}</stderr>\n" +
+      results.pretty_inspect +
       "-----------------------\n")
 
-    if status.exitstatus == 1
+    if results[:exit_code] == 1
       return true
     else
       return false

data/lib/rspec-system/node_set/vagrant.rb

@@ -58,6 +58,11 @@ module RSpecSystem
     # Transfer files to a host in the NodeSet.
     #
     # @param opts [Hash] options
+    # @todo This is damn ugly, because we ssh in as vagrant, we copy to a temp
+    #   path then move it later. Its slow and brittle and we need a better
+    #   solution. Its also very Linux-centrix in its use of temp dirs.
+    # @todo Need to return more interesting information, not just the systemu
+    #   results. This will require a formalisation of this API.
     def rcp(opts)
       #log.debug("[Vagrant@rcp] called with #{opts.inspect}")
 
@@ -65,18 +70,29 @@ module RSpecSystem
       source = opts[:sp]
       dest_path = opts[:dp]
 
-      # TODO: This is damn ugly, because we ssh in as vagrant, we copy to a
-      # temp path then move later. This pattern at the moment only really works
-      # on dirs.
       log.info("[Vagrant#rcp] Transferring files from #{source} to #{dest}:#{dest_path}")
 
-      # TODO: The static temp path here is definately insecure
-      cmd = "scp -r -F '#{ssh_config}' '#{source}' #{dest}:/tmp/tmpxfer"
+      # Grab a remote path for temp transfer
+      tmpdest = tmppath
+
+      # Do the copy and print out results for debugging
+      cmd = "scp -r -F '#{ssh_config}' '#{source}' #{dest}:#{tmpdest}"
       log.debug("[Vagrant#rcp] Running command: #{cmd}")
-      systemu cmd
+      r = systemu cmd
+
+      result = {
+        :exit_code => r[0].exitstatus,
+        :stdout => r[1],
+        :stderr => r[2]
+      }
 
-      # Now we move the file into place
-      run(:n => opts[:d], :c => "mv /tmp/tmpxfer #{dest_path}")
+      log.info("system_run results:\n" +
+        "-----------------------\n" +
+        result.pretty_inspect +
+        "-----------------------\n")
+
+      # Now we move the file into their final destination
+      run(:n => opts[:d], :c => "mv #{tmpdest} #{dest_path}")
     end
 
     # Create the Vagrantfile for the NodeSet.
@@ -145,5 +161,24 @@ module RSpecSystem
       end
       nil
     end
+
+    # Return a random string of chars, used for temp dir creation
+    #
+    # @api private
+    # @return [String] string of 50 random characters A-Z and a-z
+    def random_string
+      o =  [('a'..'z'),('A'..'Z')].map{|i| i.to_a}.flatten
+      (0...50).map{ o[rand(o.length)] }.join
+    end
+
+    # Generates a random string for use in remote transfers.
+    #
+    # @api private
+    # @return [String] a random path
+    # @todo Very Linux dependant, probably need to consider OS X and Windows at
+    #   least.
+    def tmppath
+      '/tmp/' + random_string
+    end
   end
 end

data/rspec-system.gemspec

@@ -2,7 +2,7 @@
 Gem::Specification.new do |s|
   # Metadata
   s.name        = "rspec-system"
-  s.version     = "0.3.0"
+  s.version     = "0.3.1"
   s.authors     = ["Ken Barber"]
   s.email       = ["ken@bob.sh"]
   s.homepage    = "https://github.com/kbarber/rspec-system"

data/spec/fixtures/example_dir/example_file

@@ -0,0 +1 @@
+Test content 1234

data/spec/spec_helper_system.rb

@@ -1,5 +1,16 @@
 require 'rspec-system/spec_helper'
 
+module LocalHelpers
+  def proj_root
+    Pathname.new(File.expand_path(File.join(File.dirname(__FILE__), '..')))
+  end
+
+  def fixture_root
+    proj_root + 'spec' + 'fixtures'
+  end
+end
+
 RSpec.configure do |c|
   c.include RSpecSystem::Helpers
+  c.include ::LocalHelpers
 end

data/spec/system/basic_spec.rb

@@ -7,4 +7,16 @@ describe "basic tests:" do
       r[:stdout].should =~ /localhost/
     end
   end
+
+  it 'check system_rcp works' do
+    system_rcp(
+      :sp => fixture_root + 'example_dir',
+      :dp => '/tmp/example_destination'
+    )
+
+    system_run('cat /tmp/example_destination/example_file') do |r|
+      r[:exit_code].should == 0
+      r[:stdout].should =~ /Test content 1234/
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-system
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -98,6 +98,7 @@ files:
 - resources/kwalify-schemas/prefabs_schema.yml
 - resources/prefabs.yml
 - rspec-system.gemspec
+- spec/fixtures/example_dir/example_file
 - spec/fixtures/nodeset_example1.yml
 - spec/fixtures/nodeset_example2.yml
 - spec/spec_helper.rb