jamie 0.1.0.alpha3 → 0.1.0.alpha4

data/lib/jamie/version.rb

@@ -2,5 +2,5 @@
 
 module Jamie
 
-  VERSION = "0.1.0.alpha3"
+  VERSION = "0.1.0.alpha4"
 end

data/lib/jamie.rb

@@ -372,11 +372,18 @@ module Jamie
     # @return [String] a command string to setup the test suite, or nil if no
     #   work needs to be performed
     def setup_cmd
-      @setup_cmd ||= begin
-        cmd = []
-        cmd << install_cmd  if install_cmd
-        cmd << sync_cmd     if sync_cmd
-        cmd.empty? ? nil : cmd.join("\n")
+      @setup_cmd ||= if local_suite_files.empty?
+        nil
+      else
+        <<-INSTALL_CMD.gsub(/ {10}/, '')
+          #{sudo}#{ruby_bin} -e "$(cat <<"EOF"
+          #{install_script}
+          EOF
+          )"
+          #{sudo}#{jr_bin} install #{plugins.join(' ')}
+          #{sudo}rm -rf $(#{jr_bin} suitepath)/*
+          #{local_suite_files.map { |f| stream_file(f, remote_file(f)) }.join}
+        INSTALL_CMD
       end
     end
 
@@ -388,11 +395,7 @@ module Jamie
     # @return [String] a command string to run the test suites, or nil if no
     #   work needs to be performed
     def run_cmd
-      @run_cmd ||= if plugins.empty?
-        nil
-      else
-        plugins.map { |p| "#{sudo}#{jr_bin} #{p}" }.join(' && ')
-      end
+      @run_cmd ||= local_suite_files.empty? ? nil : "#{sudo}#{jr_bin} test"
     end
 
     private
@@ -406,30 +409,6 @@ module Jamie
       raise ArgumentError, "'suite_name' is required." if suite_name.nil?
     end
 
-    def install_cmd
-      @install_cmd ||= if plugins.empty?
-        nil
-      else
-        <<-INSTALL_CMD.gsub(/ {10}/, '')
-          #{sudo}#{ruby_bin} -e "$(cat <<"EOF"
-          #{install_script}
-          EOF
-          )"
-          #{sudo}#{jr_bin} install #{plugins.join(' ')}
-        INSTALL_CMD
-      end
-    end
-
-    def sync_cmd
-      @sync_cmd ||= if local_suite_files.empty?
-        nil
-      else
-        [ "#{sudo}rm -rf $(#{jr_bin} suitepath)/*",
-          local_suite_files.map { |f| stream_file(f, remote_file(f)) }.join
-        ].join("\n")
-      end
-    end
-
     def install_script
       @install_script ||= begin
         uri = URI.parse(INSTALL_URL)
@@ -464,6 +443,7 @@ module Jamie
       jr_stream_file = "#{jr_bin} stream-file #{remote_path} #{md5} #{perms}"
 
       <<-STREAMFILE.gsub(/^ {8}/, '')
+        echo "       Uploading #{remote_path} (mode=#{perms})"
         cat <<"__EOFSTREAM__" | #{sudo}#{jr_stream_file}
         #{Base64.encode64(local_file)}
         __EOFSTREAM__

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jamie
 version: !ruby/object:Gem::Version
-  version: 0.1.0.alpha3
+  version: 0.1.0.alpha4
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-10 00:00:00.000000000 Z
+date: 2012-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout