marionetta 0.4.7.1 → 0.4.8

data/README.md

@@ -177,7 +177,6 @@ staging.manipulate_each_server(:deployer, :rollback)
  - Add ability to define permissions with Manipulators::Deployer
  - Change :before_script and :after_script to :before_scripts and :after_scripts
    that take an array
- - Use same technique for transfering puppet files as used by deployer
 
 ## Author
 

data/lib/marionetta.rb

@@ -27,7 +27,7 @@
 # 
 module Marionetta
 
-  VERSION = '0.4.7.1'
+  VERSION = '0.4.8'
 
   ### Defining Servers
 

data/lib/marionetta/directory_sync.rb

@@ -4,7 +4,7 @@ module Marionetta
   class DirectorySync
     include Commandable
 
-    def self.sync(server, from, to, options)
+    def self.sync(server, from, to, options = {})
       new(server).sync(from, to, options)
     end
 
@@ -12,9 +12,16 @@ module Marionetta
       @server = server
     end
 
-    def sync(from, to, options)
+    def sync(from, to, options = {})
       create_dir(to)
-      sync_dir(from, to, options[:exclude])
+
+      if options.has_key?(:exclude)
+        excludes = options[:exclude]
+      else
+        excludes = []
+      end
+
+      sync_dir(from, to, excludes)
     end
 
   private

data/lib/marionetta/manipulators.rb

@@ -16,7 +16,7 @@ module Marionetta
     # 
     require_relative 'manipulators/deployer'
     require_relative 'manipulators/debloyer'
-    require_relative 'manipulators/puppet_manipulator'
+    require_relative 'manipulators/puppet'
 
     # A hash of all the manipulators.
     # 

data/lib/marionetta/manipulators/{puppet_manipulator.rb → puppet.rb}

@@ -8,6 +8,7 @@
 # nodes them this class maybe what you're looking for.
 # 
 require 'marionetta/commandable'
+require 'marionetta/directory_sync'
 
 module Marionetta
   module Manipulators
@@ -71,9 +72,8 @@ module Marionetta
       # 
       def update()
         install unless installed?
-        archive_files
-        send_archive
-        apply_archive
+        send_puppet_files
+        apply_puppet_files
       end
 
     private
@@ -109,36 +109,27 @@ module Marionetta
         "/tmp/puppet_#{server[:hostname]}"
       end
 
-      def archive_files()
-        cmds = [
-          "rm -rf #{puppet_tmp}",
-          "mkdir #{puppet_tmp}",
-          "cp #{server[:puppet][:manifest]} #{puppet_tmp}/manifest.pp",
-        ]
+      def send_puppet_files()
+        from = [server[:puppet][:manifest]]
 
         if server[:puppet].has_key?(:modules)
-          cmds << "cp -r #{server[:puppet][:modules]} #{puppet_tmp}/modules"
+          from << server[:puppet][:modules]
         end
 
-        cmd.system(cmds.join(' && '))
-        cmd.archive(puppet_tmp)
+        cmd.put(from, puppet_tmp)
       end
 
-      def send_archive()
-        cmd.put("#{puppet_tmp}.tar.gz")
-      end
-
-      def apply_archive()
-        cmd.ssh_extract("#{puppet_tmp}.tar.gz")
+      def apply_puppet_files()
         cmds = ["cd #{puppet_tmp}"]
 
         puppet_cmd = ['sudo puppet apply']
 
         if server[:puppet].has_key?(:modules)
-          puppet_cmd << "--modulepath=#{puppet_tmp}/modules"
+          module_basename = File.basename(server[:puppet][:modules])
+          puppet_cmd << "--modulepath=#{puppet_tmp}/#{module_basename}"
         end
 
-        puppet_cmd << 'manifest.pp'
+        puppet_cmd << File.basename(server[:puppet][:manifest])
 
         if server[:puppet].has_key?(:flags)
           puppet_cmd << server[:puppet][:flags]

data/spec/puppet_manipulator_spec.rb

@@ -1,5 +1,5 @@
 require 'spec_helper'
-require_relative '../lib/marionetta/manipulators/puppet_manipulator'
+require_relative '../lib/marionetta/manipulators/puppet'
 
 describe Marionetta::Manipulators::Puppet do
   it 'should manipulate one server map' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marionetta
 version: !ruby/object:Gem::Version
-  version: 0.4.7.1
+  version: 0.4.8
   prerelease: 
 platform: ruby
 authors:
@@ -146,7 +146,7 @@ files:
 - lib/marionetta/manipulators.rb
 - lib/marionetta/manipulators/debloyer.rb
 - lib/marionetta/manipulators/deployer.rb
-- lib/marionetta/manipulators/puppet_manipulator.rb
+- lib/marionetta/manipulators/puppet.rb
 - lib/marionetta/rake_helper.rb
 - marionetta.gemspec
 - spec/app/after
@@ -179,7 +179,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1088105927365004280
+      hash: 3588169205023904270
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -188,7 +188,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1088105927365004280
+      hash: 3588169205023904270
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24