pawnee 0.1.4 → 0.1.5

data/.gitignore

@@ -15,4 +15,5 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
-coverage
+coverage
+spec/vagrant/.vagrant

data/docs/TODO.md

@@ -6,10 +6,7 @@ TODO: Add a as_user('user') do .. end option
 					- maybe have an option to run from within a shell, or we could get them into the right place every time
 				- maybe we should add a system to "get you to root, then get you to another user"
 TODO: Need to make a clear way for pawnee gems (and recipes) to provide actions (example, git gem provides git actions)
-TODO: Run actions in threads (across multiple servers)
 TODO: Test to make sure arguments work directly as well (they probably don't right now)
-TODO: System to check for and register updates/modifications
-TODO: Add apt-get update to package stuff - make it only run update once per all jobs
 TODO: Make it so copied files can be overridden in a rails project
 TODO: Track modified on compile?
 TODO: Should setup self.source_root to point to the templates dir in the gem
@@ -17,6 +14,33 @@ TODO: Add --verbose option that shows the output of any outputs (bundler for exa
  				- maybe show stderr by default?
 				- maybe option to show on run/exec
 				- show stderr when there's a non-0 exit status
+TODO: Make sure it would print out any errors from bundler
+TODO: Raise error on run error (with options to ignore during run, or options to always ignore (global config))
+TODO: Allow ssh host strings user:pw@domain
+TODO: Make thor-ssh local api compatible
+TODO: Move to self namespacing - remove global_options
+TODO: Work out dependency loading
+TODO: Make the source_root work by default
+
+
+
+THINK ABOUT:
+
+---- logging system -----
+
+Log levels
+- error - stderr
+- info - actions
+- debug - stdout
+
+State Changes (and colors):
+- create (green)
+- update (yellow)
+- destroy (red?)
+- identical (blue)
+
+Log Actions
+same, identical, update, add, run
 
 
 def setup

data/lib/pawnee/pawnee/actions/compile.rb

@@ -35,7 +35,7 @@ module Pawnee
       installed = false
       if options[:bin_file]
         # Check if the bin file is installed
-        installed = exec("which #{options[:bin_file]}").strip != ''
+        installed = exec("which #{options[:bin_file]}", :log_stderr => false).strip != ''
       else
         raise "You must pass :bin_file or a block to compile" unless block_given?
         installed = yield()
@@ -45,6 +45,8 @@ module Pawnee
         say_status :already_compiled, url, :blue
         return true
       else
+        
+        track_modification!
         # Compile and install
         Compile.new(self, url, temp_dir, options)
       end

data/lib/pawnee/pawnee/actions/inject_into_file.rb

@@ -10,6 +10,9 @@ module Pawnee
         data, config = args.shift, args.shift
       end
       
+      # Get the data if its a proc
+      data = data.call if data.is_a?(Proc)
+      
       if destination_files.binread(destination)[data]
         say_status :identical, destination
         # Don't run again, the text is already in place

data/lib/pawnee/pawnee/actions/package.rb

@@ -74,8 +74,9 @@ module Pawnee
     # to prevent this from happening too much.
     def update_package_list
       # TODO: this needs to be per server
-      unless defined?(@@packages_updated)
-        @@packages_updated = true
+      unless defined?(@@packages_updated) && @@packages_updated[server]
+        @@packages_updated ||= {}
+        @@packages_updated[server] = true
         as_root do
           exec('DEBIAN_FRONTEND=noninteractive apt-get -q -y update', :no_pty => true)
         end

data/lib/pawnee/pawnee/actions/user.rb

@@ -110,7 +110,7 @@ module Pawnee
 
           # Reject any ones we just changed, so its as if we did a find with these
           @changed_attributes = @changed_attributes.reject {|k,v| [:uid, :gid, :groups, :login].include?(k.to_sym) }
-          @original_groups_value = @groups
+          @original_groups_value = @groups.dup
         else
           # No user
           @uid = nil

data/lib/pawnee/pawnee/base.rb

@@ -25,7 +25,7 @@ module Pawnee
     include Pawnee::SshConnection
     include Roles
     
-    attr_accessor :server
+    attr_accessor :server, :server_options, :setup_with_connection
     
     # Creates an instance of the pawnee recipe
     #
@@ -121,6 +121,7 @@ module Pawnee
     no_tasks {
       
       # # Invoke the given task if the given args.
+      # TODO: This method needs some refactoring
       def invoke_task(task, *args) #:nodoc:
         current = @_invocations[self.class]
 
@@ -130,6 +131,8 @@ module Pawnee
 
         unless current.include?(task.name)
           current << task.name
+          
+          puts " Run task: #{self.class.class_role.to_s} - #{task.name} ".center(80, '*')
 
           # Setup the server connections before we run the task
           servers = options[:servers] || options['servers']
@@ -142,41 +145,71 @@ module Pawnee
             # No servers, just run locally
             task.run(self, *args)
           else
+            first_invoke = true
+            # Create a list of instances that we want to run this task
+            instances = []
+            
             # Run the setup task, setting up the needed connections
             servers.each do |server|
               # Only run on this server if the server supports the current recipe's
               # role.
               next unless server.is_a?(String) || server.is_a?(Net::SSH::Connection::Session) || (server['roles'] && server['roles'].include?(self.class.class_role))
 
+              if first_invoke
+                instance = self
+                first_invoke = false
+              else
+                # Make a clone (since we want to run self on different threads)
+                # TODO: Look into how deep we need to make this clone (options may be 
+                # shared right now)
+                instance = self.clone
+              end
               # Setup the connection to the server
               if server.is_a?(Net::SSH::Connection::Session)
-                self.destination_connection = server
-                self.server = server.host
+                instance.destination_connection = server
+                instance.server = server.host
+                instance.setup_with_connection = true
               elsif server.is_a?(String)
                 # Server name is a string, asume ubuntu
-                self.destination_connection = Net::SSH.start(server, 'ubuntu')
-                self.server = server
+                instance.destination_connection = Net::SSH.start(server, 'ubuntu')
+                instance.server = server
               else
                 # Server is a hash
-                self.destination_connection = Net::SSH.start(server['domain'], server['user'] || 'ubuntu')
-                self.server = server['domain']
+                instance.destination_connection = Net::SSH.start(server['domain'], server['user'] || 'ubuntu')
+                instance.server = server['domain']
+                instance.server_options = server
               end
               
+              # Setup server options if not setup already
+              instance.server_options = instance.server_options || {}
+              
+              # Add the instance to the list of instances to run on
+              instances << instance
+            end
+            
+            # Take the list of instances and invoke the task on each one in a seperate thread
+            threads = []
+            
+            instances.each do |instance|
+              threads << Thread.new do
+                # Run the task
+                task.run(instance, *args)
 
-              # Run the task
-              task.run(self, *args)
-
-              # Remove the server
-              self.server = nil
+                # Remove the server
+                instance.server = nil
 
-              # Close the connection
-              if self.destination_connection
-                # Close the conection only if we created it.  If it was passed in as a connection
-                # then the creator is responsible for closing it
-                self.destination_connection.close unless server.is_a?(Net::SSH::Connection::Session)
-                self.destination_connection = nil
+                # Close the connection
+                if instance.destination_connection
+                  # Close the conection only if we created it.  If it was passed in as a connection
+                  # then the creator is responsible for closing it
+                  instance.destination_connection.close unless instance.setup_with_connection
+                  instance.destination_connection = nil
+                end
               end
             end
+            
+            # Wait for threads to finish
+            threads.each(&:join)
           end
         end
       end
@@ -184,45 +217,23 @@ module Pawnee
       # Whenever say is used, also print out the server name
       def say(*args)
         text = args[0]
-        text = "[#{server}]:\t" + text.to_s if server
+        name = (server_options && server_options['name']) || server
+        text = "[#{name}]:\t" + text.to_s if name
         super(text, *args[1..-1])
       end
       
       def say_status(*args)
         text = args[0]
-        text = "[#{server}]:\t" + text.to_s if server
+        name = (server_options && server_options['name']) || server
+        text = "[#{name}]:\t" + text.to_s if name
         super(text, *args[1..-1])        
       end
     }
     
-    private
-      def self.global_options
-        @global_options = true
-        yield
-        @global_options = false
-      end
-      
+    private      
       def self.check_unknown_options?(config)
         false
       end
-    
-    
-      # Add options to create global method_options, otherwise
-      # they are now prefixed by the recipe name by default
-      def self.method_option(name, options={})
-        scope = if options[:for]
-          find_and_refresh_task(options[:for]).options
-        else
-          method_options
-        end
-
-        unless @global_options
-          prefix = self.gem_name.gsub('-', '_')
-          name = "#{prefix}_#{name}".to_sym
-        end
-
-        build_option(name, options, scope)
-      end
       
 
       # Inherited is called when a class inherits from Pawnee::Base, it then

data/lib/pawnee/pawnee/cli.rb

@@ -11,23 +11,18 @@ module Pawnee
     namespace ''
 
     desc "setup", "calls setup for each pawnee gem in bundler"
-    global_options do
-      method_option :roles, :type => :array, :default => :all
-    end
+    method_option :roles, :type => :array, :default => :all
     def setup
       Pawnee::Base.invoke_roles(:setup, self.options[:roles], self.options)
     end
 
 
     desc "teardown", "calls teardown for each pawnee gem in bundler"
-    global_options do
-      method_option :roles, :type => :array, :default => :all
-    end
+    method_option :roles, :type => :array, :default => :all
     def teardown
       Pawnee::Base.invoke_roles(:setup, self.options[:roles], self.options)
     end
 
-
     # Create a new gem (pulled from bundler and modified - MIT LICENSE)
     desc "gem GEM", "Creates a skeleton recipie"
     method_option :bin, :type => :boolean, :default => false, :aliases => '-b', :banner => "Generate a binary for your library."

data/lib/pawnee/pawnee/templates/newgem/lib/pawnee/newgem/base.rb.tt

@@ -6,21 +6,12 @@ require 'pawnee/base'
 <%- end -%>
 <%- j = config[:constant_array].size -%>
 <%= '  '*j %>class Base < Pawnee::Base
-<%= '  '*j %>  global_options do
-<%= '  '*j %>    method_option :servers, :type => :array, :required => true
-<%= '  '*j %>  end
+<%= '  '*j %>  method_option :servers, :type => :array, :required => true
 <%= '  '*j %>  desc "setup", 'setup on the destination server'
 <%= '  '*j %>  def setup
 <%= '  '*j %>    # Add your setup code here
 <%= '  '*j %>  end
 <%= '  '*j %>  
-<%= '  '*j %>  global_options do
-<%= '  '*j %>    method_option :servers, :type => :array, :required => true
-<%= '  '*j %>  end
-<%= '  '*j %>  desc "teardown", 'teardown on the destination server'
-<%= '  '*j %>  def teardown
-<%= '  '*j %>    # Add your teardown code here
-<%= '  '*j %>  end
 <%= '  '*j %>end
 <%- (config[:constant_array].size-1).downto(0) do |i| -%>
 <%= '  '*i %>end

data/lib/pawnee/pawnee/version.rb

@@ -1,3 +1,3 @@
 module Pawnee
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

data/spec/actions/compile_spec.rb

@@ -9,16 +9,20 @@ describe "compile actions" do
     @base.destination_connection = VagrantManager.connect
   end
   
-  it 'should install a package' do
+  it 'should install a package and track modification' do
     @base.as_root do
       @base.remove_file("/usr/local/bin/redis-server")
     end
-    @base.exec('which redis-server').should == ''
+    @base.exec('which redis-server', :log_stderr => false).should == ''
+    @base.modified?.should == false
     
     @base.compile('http://redis.googlecode.com/files/redis-2.4.15.tar.gz', '/home/vagrant/redis-server/', {:skip_configure => true, :bin_file => 'redis-server'})
     
-    @base.exec('which redis-server').should_not == ''
+    @base.exec('which redis-server', :log_stderr => false).should_not == ''
+    
+    @base.modified?.should == true
   end
   
+  
 end
 

data/spec/actions/user_spec.rb

@@ -10,7 +10,7 @@ describe "user actions" do
   end
   
   def user_exists?(login)
-    _, _, exit_code, _ = @base.exec("id -u #{login}", :with_codes => true)
+    _, _, exit_code, _ = @base.exec("id -u #{login}", :with_codes => true, :log_stderr => false)
     return exit_code == 0
   end
   

data/spec/spec_helper.rb

@@ -20,7 +20,7 @@ RSpec.configure do |config|
     unless ENV['TRAVIS']
       # Rollback the server
       puts "Roll back test server"
-      # `cd spec/vagrant/ ; BUNDLE_GEMFILE=../../Gemfile bundle exec vagrant sandbox rollback`
+      `cd spec/vagrant/ ; BUNDLE_GEMFILE=../../Gemfile bundle exec vagrant sandbox rollback`
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pawnee
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-26 00:00:00.000000000 Z
+date: 2012-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -293,7 +293,6 @@ files:
 - spec/base_spec.rb
 - spec/modified_spec.rb
 - spec/spec_helper.rb
-- spec/vagrant/.vagrant
 - spec/vagrant/Vagrantfile
 - spec/vagrant/vagrant.rb
 homepage: ''
@@ -310,7 +309,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4043066546838291018
+      hash: 4195585264786359942
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -319,7 +318,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4043066546838291018
+      hash: 4195585264786359942
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.22
@@ -335,6 +334,5 @@ test_files:
 - spec/base_spec.rb
 - spec/modified_spec.rb
 - spec/spec_helper.rb
-- spec/vagrant/.vagrant
 - spec/vagrant/Vagrantfile
 - spec/vagrant/vagrant.rb

data/spec/vagrant/.vagrant

@@ -1 +0,0 @@
-{"active":{"default":"c90bb8aa-bba5-4bdf-98e8-5097a58829c8"}}