pawnee 0.1.1 → 0.1.3

data/README.md

@@ -34,6 +34,9 @@ This system will:
   - but deploying should be a separate thing (not like rubber)
 6. **It should use thor for template stuff**
 	- and just overwrite it so files get copied to remote destinations if needed
+7. **It should be able to go up to root**
+	- you should be able to login as one user and as long as they are a sudoer all
+		commands should be able to jump up to root when needed
 
 
 A note on idempotence.  Being idempotent is a big selling point for chef.  Pawnee strives for idempotence but provides it in different ways.  For example, where chef would provide a more dsl like way to declare what to do when changes are made, pawnee tries to avoid too much DSL, so the recipe developer will need to be aware that the task may be run multiple times.  We find that either way the recipe developer needs to understand this situation, and with the Pawnee way, its made clearer in the code.

data/docs/TODO.md

@@ -9,7 +9,14 @@ TODO: Need to make a clear way for pawnee gems (and recipes) to provide 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
+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
+TODO: Add --verbose option that shows the output of any outputs (bundler for example)
+ 				- maybe show stderr by default?
+				- maybe option to show on run/exec
+				- show stderr when there's a non-0 exit status
 
 
 def setup

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

@@ -21,7 +21,8 @@ module Pawnee
     # installed
     #
     # :bin_file   - the name of an executable that the method can check for in the path
-    # :configure  - a string of options to pass to the ./configure command.
+    # :config_options  - a string of options to pass to the ./configure command.
+    # :skip_configure - skips the configure step
     #
     # === Block
     # You can also pass a block that if it returns true, it will not 
@@ -34,7 +35,7 @@ module Pawnee
       installed = false
       if options[:bin_file]
         # Check if the bin file is installed
-        installed = exec(options[:bin_file]).strip != ''
+        installed = exec("which #{options[:bin_file]}").strip != ''
       else
         raise "You must pass :bin_file or a block to compile" unless block_given?
         installed = yield()
@@ -76,7 +77,7 @@ module Pawnee
         
         download(url)
         extract
-        configure
+        configure unless options[:skip_configure]
         make
         make_install
       end
@@ -108,7 +109,7 @@ module Pawnee
       # action_name<String>:: An action name (used to explain what is happening)
       def run_with_failure_handler(command, action_name)
         base.say_status action_name.downcase, ''
-        stdout, stderr, exit_code, exit_status = base.exec(command, true)
+        stdout, stderr, exit_code, exit_status = base.exec(command, :with_codes => true)
         
         if exit_code != 0
           base.say_status :error, "Unable to #{action_name}, see output below", :red
@@ -121,7 +122,7 @@ module Pawnee
 
       # Runs ./configure on the files
       def configure
-        run_with_failure_handler("cd #{@extracted_path} ; ./configure #{options[:configure] || ''}", 'configure')
+        run_with_failure_handler("cd #{@extracted_path} ; ./configure #{options[:config_options] || ''}", 'configure')
       end
       
       # Runs make

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

@@ -0,0 +1,23 @@
+module Pawnee
+  module Actions
+    # Adds a :once option that will only do the action the first
+    # time it is run (it will check for the text before it injects
+    # it each time)
+    def insert_into_file(destination, *args, &block)
+      if block_given?
+        data, config = block, args.shift
+      else
+        data, config = args.shift, args.shift
+      end
+      
+      if config[:once]
+        if destination_files.binread(destination)[data]
+          # Don't run again, the text is already in place
+          return
+        end
+      end
+      
+      action InjectIntoFile.new(self, destination, data, config)
+    end
+  end
+end

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

@@ -31,7 +31,7 @@ module Pawnee
     def installed_package_version(package_name)
       packages = nil
       as_root do
-        packages = exec("dpkg -l")
+        packages = exec("dpkg -l", :no_pty => true)
       end
       
       packages.split(/\n/).grep(/^ii /).each do |package|
@@ -55,17 +55,33 @@ module Pawnee
     # package_name<String>:: The name of package to be installed
     # version<String>:: The version of the package
     def install_package(package_name, version=nil)
+      update_package_list
+      
       if package_installed?(package_name)
         say_status "package already installed", package_name
       else
         package_name = "#{package_name}=#{version}" if version
+        track_modification!
         as_root do
-          exec("apt-get -y install #{package_name}")
+          exec("DEBIAN_FRONTEND=noninteractive apt-get -q -y install #{package_name}", :no_pty => true)
         end
         say_status "installed package", package_name.gsub('=', ' ')
       end
     end
     
+    # Updates the package manager to the most recent list of 
+    # packages.  Also only runs this once per group of operations
+    # 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
+        as_root do
+          exec('DEBIAN_FRONTEND=noninteractive apt-get -q -y update', :no_pty => true)
+        end
+      end
+    end
+    
     # Installs a set of packages, use install_package if you 
     # wish to specify a version
     # 
@@ -75,9 +91,22 @@ module Pawnee
     # packages<Array>:: An array of strings of package names
     def install_packages(*package_names)
       packages = nil
+      # # TODO: pull in versions and use this to get a better 
+      # 
+      # as_root do
+      #   packages = exec("dpkg --get-selections", :no_pty => true)
+      # end
+      # 
+      # installed_package_names = []
+      # packages.split(/\n/).each do |package|
+      #   name, version = package.split(/\s+/)
+      #   installed_package_names << name
+      # end
+
+
       as_root do
-        exec('apt-get -y update')
-        packages = exec("dpkg -l")
+        update_package_list
+        packages = exec("dpkg -l", :no_pty => true)
       end
       
       installed_package_names = []
@@ -97,9 +126,10 @@ module Pawnee
       end
       
       if need_to_install_packages.size > 0
+        track_modification!
         as_root do
           say_status "installing packages", need_to_install_packages.join(', ')
-          exec("apt-get -y install #{need_to_install_packages.join(' ')}")
+          exec("DEBIAN_FRONTEND=noninteractive apt-get -q -y install #{need_to_install_packages.join(' ')}", :no_pty => true)
         end
       end
     end
@@ -112,7 +142,7 @@ module Pawnee
       if package_installed?(package_name)
         say_status "removed package", package_name
         as_root do
-          exec("apt-get -y remove #{package_name}")
+          exec("DEBIAN_FRONTEND=noninteractive apt-get -q -y remove #{package_name}", :no_pty => true)
         end
       else
         say_status "package not removed", package_name

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

@@ -40,8 +40,8 @@ module Pawnee
     #
     #
     class User < BaseModel
-      define_attribute_methods [:login, :uid, :gid, :groups, :comment, :shell, :password]
-      change_attr_accessor [:login, :uid, :gid, :groups, :comment, :shell, :password]
+      define_attribute_methods [:login, :uid, :gid, :groups, :comment, :shell, :password, :home]
+      change_attr_accessor [:login, :uid, :gid, :groups, :comment, :shell, :password, :home]
 
       attr_accessor :base
       
@@ -66,52 +66,99 @@ module Pawnee
         return base.run(*args)
       end
       
+      def passwd_data(find_user)
+        passwd_data = base.destination_files.binread('/etc/passwd')
+
+        if passwd_data
+          passwd_data.split(/\n/).each do |line|
+            user, *_, home, shell = line.split(':')
+          
+            if user == find_user
+              return home, shell
+            end
+          end
+        end
+        
+        return nil, nil        
+      end
+      
+      def home_for_user(find_user)
+        home, shell = passwd_data(find_user)
+        return home
+      end
+
+      def shell_for_user(find_user)
+        home, shell = passwd_data(find_user)
+        return shell
+      end
+      
       # Pull in the current (starting) state of the attributes 
       # for the User model
       def read_from_system
-        @uid, stderr, exit_code, _ = exec("id -u #{login}", true)
+        @uid, stderr, exit_code, _ = exec("id -u #{login}", :with_codes => true, :log_stderr => false, :no_pty => true)
         @uid = @uid.strip
         if exit_code == 0
           # The login exists, load in more data
-          @gid = exec("id -g #{login}").strip
-          @groups = exec("groups #{login}").gsub(/^[^:]+[:]/, '').strip.split(/ /).sort
+          @gid = exec("id -g #{login}", :log_stderr => false, :no_pty => true).strip
+          
+          @groups = exec("groups #{login}", :no_pty => true).gsub(/^[^:]+[:]/, '').strip.split(/ /).sort
+          @home = home_for_user(login)
+          
+          # TODO: Load in existing shell
+          @shell = shell_for_user(login)
           self.new_record = false
 
           # 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
         else
           # No user
           @uid = nil
+          @groups ||= []
+          @shell ||= '/bin/bash'
+          self.shell_will_change!
           self.new_record = true
         end
       end
 
       # Write any changes out
       def save
+        # Since groups is an array, we have to manually check to see if
+        # its changed, because people can do << to it
+        if @original_groups_value != @groups
+          # Mark as changed
+          self.groups_will_change!
+          
+          @original_groups_value = @groups
+        end
+        
         if changed?
           raise "A login must be specified" unless login
           
           if new_record?
             # Just create a new user
             command = ["useradd"]
-            base.say_status :create_user, login
+            base.say_status :create_user, login, :green
           else
             # Modify an existing user
             command = ["usermod"]
-            base.say_status :update_user, login
+            base.say_status :update_user, login, :green
           end
           
           # Set options
           command << "-u #{uid}" if uid && uid_changed?
           command << "-g #{gid}" if gid && gid_changed?
-          command << "-G #{groups.join(',')}" if groups && groups_changed?
+          command << "-G #{groups.join(',')}" if groups && groups_changed? && groups.size != 0
           command << "-c #{comment.inspect}" if comment && comment_changed?
           command << "-s #{shell.inspect}" if shell && shell_changed?
           command << "-p #{password.inspect}" if password && password_changed?
+          
+          # TODO: If update, we need to make the directory first to move things to
+          command << "-m -d #{home.inspect}" if home && home_changed?
           command << login
           
           base.as_root do
-            base.exec(command.join(' '))
+            base.exec(command.join(' '), :no_pty => true)
           end
         else
           base.say_status :user_exists, login, :blue
@@ -121,7 +168,7 @@ module Pawnee
       def destroy
         self.new_record = true
         base.as_root do
-          base.exec("userdel #{login}")
+          base.exec("userdel #{login}", :no_pty => true)
         end
       end
     end

data/lib/pawnee/pawnee/base.rb

@@ -9,6 +9,7 @@ require 'active_support/core_ext/hash/deep_merge'
 require 'pawnee/roles'
 require 'pawnee/invocation'
 require 'pawnee/modified'
+require 'pawnee/ssh_connection'
 
 module Pawnee
   # The pawnee gem provides the Pawnee::Base class, which includes actions
@@ -21,6 +22,7 @@ module Pawnee
     include Pawnee::Actions
     include Pawnee::Invocation
     include Pawnee::Modified
+    include Pawnee::SshConnection
     include Roles
     
     attr_accessor :server
@@ -113,7 +115,7 @@ module Pawnee
 
     # Guess the gem name based on the class name
     def self.gem_name
-      self.name.gsub(/[:][:]Base$/, '').gsub(/^[^:]+[:][:]/, '').gsub('::', '-').downcase
+      self.name.gsub(/[:][:]Base$/, '').gsub(/^[^:]+[:][:]/, '').gsub(/([A-Z]+)([A-Z][a-z])/,'\1-\2').gsub(/([a-z\d])([A-Z])/,'\1-\2').downcase
     end
     
     no_tasks {
@@ -122,6 +124,10 @@ module Pawnee
       def invoke_task(task, *args) #:nodoc:
         current = @_invocations[self.class]
 
+        # Default force for actions in options
+        # TODO: Should this get set in invoke?
+        options[:force] ||= true
+
         unless current.include?(task.name)
           current << task.name
 
@@ -178,9 +184,15 @@ module Pawnee
       # Whenever say is used, also print out the server name
       def say(*args)
         text = args[0]
-        text = "[#{server}]:\t" + text
+        text = "[#{server}]:\t" + text.to_s if server
         super(text, *args[1..-1])
       end
+      
+      def say_status(*args)
+        text = args[0]
+        text = "[#{server}]:\t" + text.to_s if server
+        super(text, *args[1..-1])        
+      end
     }
     
     private
@@ -220,7 +232,7 @@ module Pawnee
         super(subclass)
         
         # Make sure cli has been loaded at this point
-        require 'pawnee/cli'
+        require 'pawnee/cli' unless defined?(Pawnee) && defined?(Pawnee::CLI)
         
         # Skip the main CLI class
         return if subclass == Pawnee::CLI
@@ -240,6 +252,7 @@ module Pawnee
         subclass.role(class_name)
       end
       
+      
       def self.recipes
         @recipes
       end
@@ -271,6 +284,8 @@ module Pawnee
       def self.method_added(meth)
         super
         
+        require 'pawnee/cli' unless defined?(Pawnee) && defined?(Pawnee::CLI)
+        
         # Take all of the setup options and copy them to the main 
         # CLI setup task
         meth = meth.to_s

data/lib/pawnee/pawnee/cli.rb

@@ -33,17 +33,18 @@ module Pawnee
     method_option :bin, :type => :boolean, :default => false, :aliases => '-b', :banner => "Generate a binary for your library."
     def gem(name)
       # Prefix all gems with pawnee-
-      name = 'pawnee-' + name.chomp("/") # remove trailing slash if present
-      folder_name = name.gsub('-', '/')
-      target = File.join(Dir.pwd, name)
-      constant_name = name.split('_').map{|p| p[0..0].upcase + p[1..-1] }.join
-      constant_name = constant_name.split('-').map{|q| q[0..0].upcase + q[1..-1] }.join('::') if constant_name =~ /-/
+      dir_name = 'pawnee-' + name.chomp("/") # remove trailing slash if present
+      folder_name = "pawnee/" + name
+      target = File.join(Dir.pwd, dir_name)
+      constant_name = "Pawnee::" + name.split('-').map{|q| q[0..0].upcase + q[1..-1] }.join('')
+      puts constant_name
       constant_array = constant_name.split('::')
+      puts constant_array.inspect
       git_user_name = `git config user.name`.chomp
       git_user_email = `git config user.email`.chomp
       opts = {
         # Don't require the pawnee- when requring though
-        :name           => name.gsub(/^pawnee[-]/, ''),
+        :name           => name,
         :constant_name  => constant_name,
         :constant_array => constant_array,
         :author         => git_user_name.empty? ? "TODO: Write your name" : git_user_name,
@@ -54,11 +55,12 @@ module Pawnee
       template(File.join("newgem/LICENSE.tt"),               File.join(target, "LICENSE"),                opts)
       template(File.join("newgem/README.md.tt"),             File.join(target, "README.md"),              opts)
       template(File.join("newgem/gitignore.tt"),             File.join(target, ".gitignore"),             opts)
-      template(File.join("newgem/newgem.gemspec.tt"),        File.join(target, "#{name}.gemspec"),        opts)
-      template(File.join("newgem/lib/pawnee/newgem.rb.tt"),  File.join(target, "lib/pawnee/#{name}.rb"),         opts)
+      template(File.join("newgem/newgem.gemspec.tt"),        File.join(target, "#{dir_name}.gemspec"),        opts)
+      template(File.join("newgem/lib/newgem.rb.tt"),  File.join(target, "lib/#{dir_name}.rb"),         opts)
       template(File.join("newgem/lib/pawnee/newgem/version.rb.tt"), File.join(target, "lib/#{folder_name}/version.rb"), opts)
       template(File.join("newgem/lib/pawnee/newgem/base.rb.tt"), File.join(target, "lib/#{folder_name}/base.rb"), opts)
       template(File.join("newgem/spec/spec_helper.rb.tt"),   File.join(target, "spec/spec_helper.rb"), opts)
+      template(File.join("newgem/spec/base_spec.rb.tt"),   File.join(target, "spec/base_spec.rb"), opts)
       template(File.join("newgem/spec/vagrant/Vagrantfile.tt"),     File.join(target, "spec/vagrant/Vagrantfile"), opts)
       template(File.join("newgem/spec/vagrant/vagrant.rb.tt"),      File.join(target, "spec/vagrant/vagrant.rb"), opts)
       if options[:bin]

data/lib/pawnee/pawnee/invocation.rb

@@ -9,5 +9,6 @@ module Pawnee
       @_invocations = config[:invocations] || Hash.new { |h,k| h[k] = [] }
       @_initializer = [ args, options, config ]
     end
+
   end
 end

data/lib/pawnee/pawnee/setup.rb

@@ -3,16 +3,16 @@ require 'thor'
 # Add setup to the base class
 module Pawnee
   class Base < Thor
-    if defined?(Rails)
+    if defined?(Rails) && defined?(Rails::Railtie)
       class Railtie < Rails::Railtie  
       end
     end
 
     def self.setup(gem_name)
       # Setup the railtie
-      require "#{gem_name.gsub(/^pawnee[-]/, '')}/base"
+      require "pawnee/#{gem_name.gsub(/^pawnee[-]/, '')}/base"
       
-      if defined?(Rails)
+      if defined?(Rails) && defined?(Rails::Railtie)
         Railtie.initializer "#{gem_name}.configure_rails_initialization" do
           gem_recipie_name = gem_name.gsub(/^pawnee[-]/, '')
           require "#{gem_recipie_name}/base"

data/lib/pawnee/pawnee/ssh_connection.rb

@@ -0,0 +1,26 @@
+module Pawnee
+  module SshConnection
+    # Reconnects to the remote server (using net/ssh).
+    # This is useful since often things in linux don't take effect
+    # until the user creates a new login shell (adding a user to
+    # a group for example)
+    def reconnect!
+      host = self.destination_connection.host
+      options = self.destination_connection.options
+      user = options[:user]
+      
+      # Close the existing connection
+      self.destination_connection.close
+      
+      # Reconnect
+      new_connection = Net::SSH.start(host, user, options)
+      
+      # Copy the instance variables to the old conection so we can keep using
+      # the same session without reassigning references
+      self.destination_connection.instance_variables.each do |variable_name|
+        value = new_connection.instance_variable_get(variable_name)
+        self.destination_connection.instance_variable_set(variable_name, value)
+      end
+    end
+  end
+end

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

@@ -1,4 +1,4 @@
-require "<%= config[:name] %>/version"
+require "pawnee/<%= config[:name] %>/version"
 require 'pawnee/base'
 
 <%- config[:constant_array].each_with_index do |c,i| -%>

data/lib/pawnee/pawnee/templates/newgem/newgem.gemspec.tt

@@ -12,7 +12,7 @@ Gem::Specification.new do |gem|
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = "pawnee-<%=config[:name]%>"
-  gem.require_paths = ["lib/pawnee"]
+  gem.require_paths = ["lib"]
   gem.add_runtime_dependency 'pawnee'
 
   # Pawnee development dependencies - versions for these will

data/lib/pawnee/pawnee/templates/newgem/spec/base_spec.rb.tt

@@ -0,0 +1,12 @@
+require 'spec_helper'
+require 'pawnee/<%=config[:name]%>/base'
+
+describe Pawnee::<%=config[:name].capitalize %>::Base do
+  it "should install <%=config[:name]%>" do
+    connection = VagrantManager.connect
+    
+    Pawnee::Base.invoke_roles(:setup, ['<%=config[:name]%>'], {:servers => [connection], :roles => ['<%=config[:name]%>']})
+    
+    connection.close unless connection.closed?
+  end
+end

data/lib/pawnee/pawnee/version.rb

@@ -1,3 +1,3 @@
 module Pawnee
-  VERSION = "0.1.1"
+  VERSION = "0.1.3"
 end

data/spec/actions/compile_spec.rb

@@ -10,16 +10,11 @@ describe "compile actions" do
   end
   
   it 'should install a package' do
-    @base.install_packages('libpcre3', 'libpcre3-dev', 'libpcrecpp0', 'libssl-dev', 'zlib1g-dev')
-    @base.as_root do
-      @base.exec('rm /usr/local/sbin/nginx')
-    end
+    @base.exec('which redis-server').should == ''
     
-    @base.exec('which nginx').should == ''
+    @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.compile('http://nginx.org/download/nginx-1.2.0.tar.gz', '/home/vagrant/nginx/', {configure: '--sbin-path=/usr/local/sbin', :bin_file => 'nginx'})
-    
-    @base.exec('which nginx').should_not == ''
+    @base.exec('which redis-server').should_not == ''
   end
   
 end

data/spec/actions/inject_into_file_spec.rb

@@ -0,0 +1,16 @@
+require 'spec_helper'
+require 'pawnee/base'
+
+
+# NOTE: These are designed to run in order on vagrant
+describe "inject into file" do
+  before do
+    @base = Pawnee::Base.new
+    @base.destination_connection = VagrantManager.connect
+  end
+  
+  it "should only inject once if the once option is specified" do
+    
+  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}", true)
+    _, _, exit_code, _ = @base.exec("id -u #{login}", :with_codes => true)
     return exit_code == 0
   end
   
@@ -32,8 +32,8 @@ describe "user actions" do
   end
   
   it "should modify a user" do
-    # @base.should_receive(:exec).any_number_of_times.ordered.with('id -u blue', true).and_return(["1002\n", '', 0, nil])
-    # @base.should_receive(:exec).any_number_of_times.ordered.with('id -u blue', true).and_return(["1002\n", '', 0, nil])
+    # @base.should_receive(:exec).any_number_of_times.ordered.with('id -u blue', :with_codes => true).and_return(["1002\n", '', 0, nil])
+    # @base.should_receive(:exec).any_number_of_times.ordered.with('id -u blue', :with_codes => true).and_return(["1002\n", '', 0, nil])
     # @base.should_receive(:exec).any_number_of_times.ordered.with('id -g blue').and_return("1002\n")
     # @base.should_receive(:exec).any_number_of_times.ordered.with('groups blue').and_return("blue: blue")
     # @base.should_receive(:exec).once.ordered.with('useradd -c "comment" blue').and_return('')
@@ -44,6 +44,9 @@ describe "user actions" do
     )
   end
   
+  # TODO: Test when there is no groups
+  # TODO: Test default shell
+  
   it "should delete a user" do
     user_exists?('blue').should == true
   

data/spec/base_spec.rb

@@ -106,7 +106,7 @@ describe Pawnee::Base do
       'servers' => [
         {'domain' => 'test1.com', 'roles' => ['red']},
         {'domain' => 'test2.com', 'roles' => ['blue', 'red']}
-      ]
+      ], 'force' => true
     }
 
     Pawnee::Base.should_receive(:config_options).at_least(:once).and_return(config_options)
@@ -130,7 +130,7 @@ describe Pawnee::Base do
       'servers' => [
         {'domain' => 'test1.com', 'roles' => ['red']},
         {'domain' => 'test2.com', 'roles' => ['red']}
-      ]
+      ], 'force' => true
     }
     
     Pawnee::Base.should_receive(:config_options).at_least(:once).and_return(options)
@@ -151,7 +151,7 @@ describe Pawnee::Base do
       'servers' => [
         {'domain' => 'test1.com', 'roles' => ['red']},
         {'domain' => 'test2.com', 'roles' => ['red', 'blue']}
-      ]
+      ], 'force' => true
     }
     
     Pawnee::Base.should_receive(:config_options).at_least(:once).and_return(options)

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

data/spec/vagrant/.vagrant

@@ -1 +1 @@
-{"active":{"default":"9a7fbb28-386f-478a-b11c-6ce30056d085"}}
+{"active":{"default":"c90bb8aa-bba5-4bdf-98e8-5097a58829c8"}}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pawnee
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-17 00:00:00.000000000 Z
+date: 2012-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -258,6 +258,7 @@ files:
 - lib/pawnee/pawnee/actions.rb
 - lib/pawnee/pawnee/actions/base_model.rb
 - lib/pawnee/pawnee/actions/compile.rb
+- lib/pawnee/pawnee/actions/inject_into_file.rb
 - lib/pawnee/pawnee/actions/package.rb
 - lib/pawnee/pawnee/actions/user.rb
 - lib/pawnee/pawnee/base.rb
@@ -268,16 +269,17 @@ files:
 - lib/pawnee/pawnee/railtie.rb
 - lib/pawnee/pawnee/roles.rb
 - lib/pawnee/pawnee/setup.rb
+- lib/pawnee/pawnee/ssh_connection.rb
 - lib/pawnee/pawnee/templates/newgem/Gemfile.tt
 - lib/pawnee/pawnee/templates/newgem/LICENSE.tt
 - lib/pawnee/pawnee/templates/newgem/README.md.tt
 - lib/pawnee/pawnee/templates/newgem/Rakefile.tt
-- lib/pawnee/pawnee/templates/newgem/bin/newgem.tt
 - lib/pawnee/pawnee/templates/newgem/gitignore.tt
-- lib/pawnee/pawnee/templates/newgem/lib/pawnee/newgem.rb.tt
+- lib/pawnee/pawnee/templates/newgem/lib/newgem.rb.tt
 - lib/pawnee/pawnee/templates/newgem/lib/pawnee/newgem/base.rb.tt
 - lib/pawnee/pawnee/templates/newgem/lib/pawnee/newgem/version.rb.tt
 - lib/pawnee/pawnee/templates/newgem/newgem.gemspec.tt
+- lib/pawnee/pawnee/templates/newgem/spec/base_spec.rb.tt
 - lib/pawnee/pawnee/templates/newgem/spec/spec_helper.rb.tt
 - lib/pawnee/pawnee/templates/newgem/spec/vagrant/Vagrantfile.tt
 - lib/pawnee/pawnee/templates/newgem/spec/vagrant/vagrant.rb.tt
@@ -285,6 +287,7 @@ files:
 - pawnee.gemspec
 - spec/actions/compile_spec.rb
 - spec/actions/file_spec.rb
+- spec/actions/inject_into_file_spec.rb
 - spec/actions/package_spec.rb
 - spec/actions/user_spec.rb
 - spec/base_spec.rb
@@ -307,7 +310,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4305242221210104072
+      hash: 2154589448393807289
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -316,7 +319,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4305242221210104072
+      hash: 2154589448393807289
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.22
@@ -326,6 +329,7 @@ summary: Better server provisioing
 test_files:
 - spec/actions/compile_spec.rb
 - spec/actions/file_spec.rb
+- spec/actions/inject_into_file_spec.rb
 - spec/actions/package_spec.rb
 - spec/actions/user_spec.rb
 - spec/base_spec.rb

data/lib/pawnee/pawnee/templates/newgem/bin/newgem.tt

@@ -1,3 +0,0 @@
-#!/usr/bin/env ruby
-
-require '<%= config[:name] %>'