jamie 0.1.0.alpha12 → 0.1.0.alpha13

data/lib/jamie/driver/vagrant.rb

@@ -15,15 +15,15 @@ module Jamie
 
       def perform_create(instance, state)
         state['name'] = instance.name
-        run "vagrant up #{state['name']} --no-provision"
+        run_command "vagrant up #{state['name']} --no-provision"
       end
 
       def perform_converge(instance, state)
-        run "vagrant provision #{state['name']}"
+        run_command "vagrant provision #{state['name']}"
       end
 
       def perform_destroy(instance, state)
-        run "vagrant destroy #{state['name']} -f"
+        run_command "vagrant destroy #{state['name']} -f"
         state.delete('name')
       end
 
@@ -34,23 +34,7 @@ module Jamie
       end
 
       def ssh(ssh_args, cmd)
-        run %{vagrant ssh #{ssh_args.first} --command '#{cmd}'}
-      end
-
-      def run(cmd)
-        puts "       [vagrant command] '#{display_cmd(cmd)}'"
-        sh = Mixlib::ShellOut.new(cmd, :live_stream => STDOUT,
-          :timeout => 60000)
-        sh.run_command
-        puts "       [vagrant command] ran in #{sh.execution_time} seconds."
-        sh.error!
-      rescue Mixlib::ShellOut::ShellCommandFailed => ex
-        raise ActionFailed, ex.message
-      end
-
-      def display_cmd(cmd)
-        parts = cmd.partition("\n")
-        parts[1] == "\n" ? "#{parts[0]}..." : cmd
+        run_command %{vagrant ssh #{ssh_args.first} --command '#{cmd}'}
       end
     end
   end

data/lib/jamie/version.rb

@@ -2,5 +2,5 @@
 
 module Jamie
 
-  VERSION = "0.1.0.alpha12"
+  VERSION = "0.1.0.alpha13"
 end

data/lib/jamie.rb

@@ -555,6 +555,59 @@ module Jamie
     end
   end
 
+  # Stateless utility methods used in different contexts. Essentially a mini
+  # PassiveSupport library.
+  module Util
+
+    def self.to_camel_case(str)
+      str.split('_').map { |w| w.capitalize }.join
+    end
+
+    def self.to_snake_case(str)
+      str.split('::').
+        last.
+        gsub(/([A-Z+])([A-Z][a-z])/, '\1_\2').
+        gsub(/([a-z\d])([A-Z])/, '\1_\2').
+        downcase
+    end
+  end
+
+  # Mixin that wraps a command shell out invocation, providing a #run_command
+  # method.
+  module ShellOut
+
+    # Wrapped exception for any interally raised shell out commands.
+    class ShellCommandFailed < StandardError ; end
+
+    # Executes a command in a subshell on the local running system.
+    #
+    # @param cmd [String] command to be executed locally
+    # @param use_sudo [TrueClass, FalseClass] whether or not to use sudo
+    # @param log_subject [String] used in the output or log header for clarity
+    #   and context
+    def run_command(cmd, use_sudo = false, log_subject = "local")
+      cmd = "sudo #{cmd}" if use_sudo
+      subject = "       [#{log_subject} command]"
+
+      $stdout.puts "#{subject} (#{display_cmd(cmd)})"
+      sh = Mixlib::ShellOut.new(cmd, :live_stream => $stdout, :timeout => 60000)
+      sh.run_command
+      puts "#{subject} ran in #{sh.execution_time} seconds."
+      sh.error!
+    rescue Mixlib::ShellOut::ShellCommandFailed => ex
+      raise ShellCommandFailed, ex.message
+    end
+
+    private
+
+    def display_cmd(cmd)
+      first_line, newline, rest = cmd.partition("\n")
+      last_char = cmd[cmd.size - 1]
+
+      newline == "\n" ? "#{first_line}\\n...#{last_char}" : cmd
+    end
+  end
+
   module Driver
 
     # Wrapped exception for any internally raised driver exceptions.
@@ -567,7 +620,7 @@ module Jamie
     def self.for_plugin(plugin, config)
       require "jamie/driver/#{plugin}"
 
-      klass = self.const_get(plugin.split('_').map { |w| w.capitalize }.join)
+      klass = self.const_get(Util.to_camel_case(plugin))
       klass.new(config)
     end
 
@@ -576,6 +629,8 @@ module Jamie
     # destroying an instance.
     class Base
 
+      include ShellOut
+
       def initialize(config)
         @config = config
         self.class.defaults.each do |attr, value|
@@ -673,6 +728,13 @@ module Jamie
         ))
       end
 
+      def run_command(cmd, use_sudo = nil, log_subject = nil)
+        use_sudo = config['use_sudo'] if use_sudo.nil?
+        log_subject = Util.to_snake_case(self.class.to_s)
+
+        super(cmd, use_sudo, log_subject)
+      end
+
       def self.defaults
         @defaults ||= Hash.new
       end
@@ -810,6 +872,8 @@ module Jamie
   # instance over SSH.
   class ChefDataUploader
 
+    include ShellOut
+
     def initialize(instance, ssh_args, jamie_root, chef_home)
       @instance = instance
       @ssh_args = ssh_args
@@ -891,30 +955,21 @@ module Jamie
 
     def run_berks(tmpdir)
       begin
-        run "if ! command -v berks >/dev/null ; then exit 1 ; fi"
+        run_command "if ! command -v berks >/dev/null; then exit 1; fi"
       rescue Mixlib::ShellOut::ShellCommandFailed
         abort ">>>>>> Berkshelf must be installed, add it to your Gemfile."
       end
-      run "berks install --path #{tmpdir}"
+      run_command "berks install --path #{tmpdir}"
     end
 
     def run_librarian(tmpdir)
       begin
-        run "if ! command -v librarian-chef >/dev/null ; then exit 1 ; fi"
+        run_command "if ! command -v librarian-chef >/dev/null; then exit 1; fi"
       rescue Mixlib::ShellOut::ShellCommandFailed
         abort ">>>>>> Librarian must be installed, add it to your Gemfile."
       end
-      run "librarian-chef install --path #{tmpdir}"
-    end
-
-    def run(cmd)
-      puts "       [local command] '#{cmd}'"
-      sh = Mixlib::ShellOut.new(cmd, :live_stream => STDOUT)
-      sh.run_command
-      puts "       [local command] ran in #{sh.execution_time} seconds."
-      sh.error!
-    rescue Mixlib::ShellOut::ShellCommandFailed => ex
-      raise ActionFailed, ex.message
+      run_command "librarian-chef install --path #{tmpdir}"
     end
   end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jamie
 version: !ruby/object:Gem::Version
-  version: 0.1.0.alpha12
+  version: 0.1.0.alpha13
   prerelease: 6
 platform: ruby
 authors:
@@ -194,7 +194,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1095190417658987214
+      hash: -1363591312854279086
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: