pawnee 0.0.6 → 0.0.8

data/.travis.yml

@@ -2,6 +2,7 @@ language: ruby
 rvm:
   - 1.9.2
   - 1.9.3
-  - jruby-19mode # JRuby in 1.9 mode
+  # # we can't run in jruby right now due to open-ssl lib
+  # - jruby-19mode # JRuby in 1.9 mode
 # uncomment this line if your project needs to run something other than `rake`:
 # script: bundle exec rspec spec

data/README.md

@@ -1,3 +1,6 @@
+[![Build Status](https://secure.travis-ci.org/ryanstout/pawnee.png?branch=master)](http://travis-ci.org/ryanstout/pawnee)
+
+
 # Pawnee - making server provisioning easier
 
 [NOTE: This is still a work in progress and not ready for use yet]
@@ -111,7 +114,7 @@ standard config options:
 - aws...
 - s3...
 
-## exposed by unicorn for example
+### exposed by unicorn for example
 app_server_locations ['localhost:3000', 'localhost:3001'] - gets picked up on by nginx maybe?
 
 

data/Rakefile

@@ -8,4 +8,24 @@ Rake::TestTask.new do |t|
   t.verbose = true
 end
 
-task :default => :test
+
+require 'rspec/core/rake_task'
+
+desc 'Default: run specs.'
+task :default => :spec
+
+desc "Run specs"
+RSpec::Core::RakeTask.new do |t|
+  if ENV['TRAVIS']
+    # Unfortunately we can't run vagrant on travis, 
+    # so this limits us quite a bit on what tests 
+    # we can run
+    t.pattern = "./spec/base_spec.rb"
+  else
+    t.pattern = "./spec/**/*_spec.rb"
+  end
+end
+
+# ENV['TRAVIS']
+
+# task :default => :test

data/lib/pawnee/pawnee/base.rb

@@ -8,6 +8,7 @@ require 'pawnee/parser/options'
 require 'active_support/core_ext/hash/deep_merge'
 require 'pawnee/roles'
 require 'pawnee/invocation'
+require 'pawnee/modified'
 
 module Pawnee
   # The pawnee gem provides the Pawnee::Base class, which includes actions
@@ -19,6 +20,7 @@ module Pawnee
     include ThorSsh::Actions
     include Pawnee::Actions
     include Pawnee::Invocation
+    include Pawnee::Modified
     include Roles
     
     attr_accessor :server

data/lib/pawnee/pawnee/cli.rb

@@ -55,9 +55,12 @@ module Pawnee
       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/lib/pawnee/newgem.rb.tt"),  File.join(target, "lib/pawnee/#{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/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]
         template(File.join("newgem/bin/newgem.tt"),          File.join(target, 'bin', name),              opts)
       end

data/lib/pawnee/pawnee/modified.rb

@@ -0,0 +1,59 @@
+module Pawnee
+  module Modified
+    def self.included(base)
+      # Extend EmptyDirectory to track modifiations
+      Thor::Actions::EmptyDirectory.class_eval do
+        alias :old_invoke_with_conflict_check :invoke_with_conflict_check
+        
+        # Change invoke with conflict check to track changes
+        # when the block is invoked.
+        def invoke_with_conflict_check(*args, &block)
+          if block_given?
+            old_invoke_with_conflict_check(*args) do
+              results = yield
+              base.track_modification!
+              return results
+            end
+          else
+            return old_invoke_with_conflict_check(*args)
+          end
+        end
+      end
+    end
+    
+    
+    # Actions track if they modify something, or if it is
+    # already in the desired state.  If they modify, they
+    # call the track_modification! method on the base class.
+    #
+    # modified? returns true if there has been a tracked
+    # modification within the current modify_block block
+    # or within the current task.
+    def modified?
+      (@modifications && @modifications.first) || false
+    end
+    
+    # Track a modification within the current modification 
+    # block.  
+    def track_modification!
+      @modifications ||= [false]
+      @modifications[@modifications.size-1] = true
+    end
+    
+    # Allows you to track modifications within a block.  During
+    # the block any call to modified? will return the value for
+    # only during the block.
+    def modify_block(&block)
+      @modifications ||= [false]
+      
+      # Add a modification value to the stack
+      @modifications << false
+      
+      yield
+      
+      # Return the modification value (can also be retrieved
+      # with modified?)
+      return @modifications.pop
+    end
+  end
+end

data/lib/pawnee/pawnee/templates/newgem/README.md.tt

@@ -20,6 +20,32 @@ Or install it yourself as:
 
 TODO: Write usage instructions here
 
+
+## Running Tests
+
+The test run through vagrant, which seemed logical since we want to test ssh stuff.
+
+### Install a box (first time only)
+		cd spec/vagrant
+		bundle exec vagrant box add ubuntu11 http://timhuegdon.com/vagrant-boxes/ubuntu-11.10.box
+		bundle exec vagrant init ubuntu11
+		
+		# enable the sandbox and create a commit we can rollback to
+		bundle exec vagrant sandbox on
+		bundle exec vagrant sandbox commit
+
+### Start box
+		vagrant up
+
+### Run the tests
+		cd ../..
+		bundle exec rspec
+		
+### When you're done
+		cd spec/vagrant
+		vagrant halt
+
+
 ## Contributing
 
 1. Fork it

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

@@ -14,5 +14,15 @@ Gem::Specification.new do |gem|
   gem.name          = "pawnee-<%=config[:name]%>"
   gem.require_paths = ["lib/pawnee"]
   gem.add_runtime_dependency 'pawnee'
+
+  # Pawnee development dependencies - versions for these will
+  # be pulled from the main pawnee gem
+  gem.add_development_dependency 'turn'
+  gem.add_development_dependency 'rspec'
+  gem.add_development_dependency 'vagrant'
+  gem.add_development_dependency 'sahara'
+  gem.add_development_dependency 'rake'
+  gem.add_development_dependency 'rdoc'
+  
   gem.version       = <%=config[:constant_name]%>::VERSION
 end

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

@@ -0,0 +1,18 @@
+require 'rspec'
+
+libdir = File.expand_path(File.dirname(__FILE__) + "/../lib/pawnee")
+$LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)
+
+require 'pawnee/<%= config[:name] %>/base'
+require 'vagrant/vagrant'
+
+
+RSpec.configure do |config|
+  config.after(:suite) do
+    unless ENV['TRAVIS']
+      # Rollback the server
+      puts "Roll back test server"
+      `cd spec/vagrant/ ; BUNDLE_GEMFILE=../../Gemfile bundle exec vagrant sandbox rollback`
+    end
+  end
+end

data/lib/pawnee/pawnee/templates/newgem/spec/vagrant/Vagrantfile.tt

@@ -0,0 +1,99 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+Vagrant::Config.run do |config|
+  # All Vagrant configuration is done here. The most common configuration
+  # options are documented and commented below. For a complete reference,
+  # please see the online documentation at vagrantup.com.
+
+  # Every Vagrant virtual environment requires a box to build off of.
+  config.vm.box = "ubuntu11"
+
+  # The url from where the 'config.vm.box' box will be fetched if it
+  # doesn't already exist on the user's system.
+  # config.vm.box_url = "http://domain.com/path/to/above.box"
+
+  # Boot with a GUI so you can see the screen. (Default is headless)
+  # config.vm.boot_mode = :gui
+
+  # Assign this VM to a host-only network IP, allowing you to access it
+  # via the IP. Host-only networks can talk to the host machine as well as
+  # any other machines on the same network, but cannot be accessed (through this
+  # network interface) by any external networks.
+  # config.vm.network :hostonly, "192.168.33.10"
+
+  # Assign this VM to a bridged network, allowing you to connect directly to a
+  # network using the host's network device. This makes the VM appear as another
+  # physical device on your network.
+  # config.vm.network :bridged
+
+  # Forward a port from the guest to the host, which allows for outside
+  # computers to access the VM, whereas host only networking does not.
+  # config.vm.forward_port 80, 8080
+
+  # Share an additional folder to the guest VM. The first argument is
+  # an identifier, the second is the path on the guest to mount the
+  # folder, and the third is the path on the host to the actual folder.
+  # config.vm.share_folder "v-data", "/vagrant_data", "../data"
+
+  # Enable provisioning with Puppet stand alone.  Puppet manifests
+  # are contained in a directory path relative to this Vagrantfile.
+  # You will need to create the manifests directory and a manifest in
+  # the file ubuntu11.pp in the manifests_path directory.
+  #
+  # An example Puppet manifest to provision the message of the day:
+  #
+  # # group { "puppet":
+  # #   ensure => "present",
+  # # }
+  # #
+  # # File { owner => 0, group => 0, mode => 0644 }
+  # #
+  # # file { '/etc/motd':
+  # #   content => "Welcome to your Vagrant-built virtual machine!
+  # #               Managed by Puppet.\n"
+  # # }
+  #
+  # config.vm.provision :puppet do |puppet|
+  #   puppet.manifests_path = "manifests"
+  #   puppet.manifest_file  = "ubuntu11.pp"
+  # end
+
+  # Enable provisioning with chef solo, specifying a cookbooks path, roles
+  # path, and data_bags path (all relative to this Vagrantfile), and adding 
+  # some recipes and/or roles.
+  #
+  # config.vm.provision :chef_solo do |chef|
+  #   chef.cookbooks_path = "../my-recipes/cookbooks"
+  #   chef.roles_path = "../my-recipes/roles"
+  #   chef.data_bags_path = "../my-recipes/data_bags"
+  #   chef.add_recipe "mysql"
+  #   chef.add_role "web"
+  #
+  #   # You may also specify custom JSON attributes:
+  #   chef.json = { :mysql_password => "foo" }
+  # end
+
+  # Enable provisioning with chef server, specifying the chef server URL,
+  # and the path to the validation key (relative to this Vagrantfile).
+  #
+  # The Opscode Platform uses HTTPS. Substitute your organization for
+  # ORGNAME in the URL and validation key.
+  #
+  # If you have your own Chef Server, use the appropriate URL, which may be
+  # HTTP instead of HTTPS depending on your configuration. Also change the
+  # validation key to validation.pem.
+  #
+  # config.vm.provision :chef_client do |chef|
+  #   chef.chef_server_url = "https://api.opscode.com/organizations/ORGNAME"
+  #   chef.validation_key_path = "ORGNAME-validator.pem"
+  # end
+  #
+  # If you're using the Opscode platform, your validator client is
+  # ORGNAME-validator, replacing ORGNAME with your organization name.
+  #
+  # IF you have your own Chef Server, the default validation client name is
+  # chef-validator, unless you changed the configuration.
+  #
+  #   chef.validation_client_name = "ORGNAME-validator"
+end

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

@@ -0,0 +1,30 @@
+require 'vagrant'
+require 'net/ssh'
+
+# Return an ssh connection to the vagrant server
+class VagrantManager
+  # Returns a connected Net::SSH connection
+  def self.connect
+    @vm = Vagrant::Environment.new(:cwd => File.dirname(__FILE__)).primary_vm
+
+    ssh_info = @vm.ssh.info
+
+    # Build the options we'll use to initiate the connection via Net::SSH
+    opts = {
+      :port                  => ssh_info[:port],
+      :keys                  => [ssh_info[:private_key_path]],
+      :keys_only             => true,
+      :user_known_hosts_file => [],
+      :paranoid              => false,
+      :config                => false,
+      :forward_agent         => ssh_info[:forward_agent]
+    }
+
+    # Check that the private key permissions are valid
+    @vm.ssh.check_key_permissions(ssh_info[:private_key_path])
+
+    # Connect to SSH, giving it a few tries
+    return Net::SSH.start(ssh_info[:host], ssh_info[:username], opts)
+  end
+end
+

data/lib/pawnee/pawnee/version.rb

@@ -1,3 +1,3 @@
 module Pawnee
-  VERSION = "0.0.6"
+  VERSION = "0.0.8"
 end

data/spec/actions/file_spec.rb

@@ -0,0 +1,27 @@
+require 'spec_helper'
+
+describe Pawnee::Base do
+  class PawneeTest < Pawnee::Base
+    def self.source_root
+      File.dirname(__FILE__)
+    end  
+  end
+  
+  before(:all) do
+    @remote_base_path = '/home/vagrant/thortest'
+    @remote_test = PawneeTest.new
+    @remote_test.destination_connection = VagrantManager.connect
+    @remote_test.destination_files.rm_rf(@remote_base_path)
+  end
+
+  after(:all) do
+    # Close the remote connection
+    @remote_test.destination_connection.close
+  end
+
+  it 'should create an empty directory remotely' do
+    @remote_test.empty_directory(@remote_base_path)
+    @remote_test.empty_directory(@remote_base_path + '2')
+    @remote_test.destination_files.exists?(@remote_base_path)
+  end
+end

data/spec/base_spec.rb

@@ -42,6 +42,7 @@ describe Pawnee::Base do
   end
   
   it "should have no recipes before they are defined, but should add them after they are defined" do
+    Pawnee::Base.instance_variable_set('@recipes', nil)
     Pawnee::Base.recipes.should == nil
 
     # These will persist between tests

data/spec/modified_spec.rb

@@ -0,0 +1,34 @@
+require 'spec_helper'
+
+describe Pawnee::Base do
+  before do
+    @base = Pawnee::Base.new
+  end
+  
+  it "should track modifications" do
+    @base.modified?.should == false
+    @base.track_modification!
+    @base.modified?.should == true
+  end
+  
+  describe "when changing files" do
+    
+    before(:all) do
+      @remote_base_path = '/home/vagrant/thortest'
+      @remote_test = Pawnee::Base.new
+      @remote_test.destination_connection = VagrantManager.connect
+      @remote_test.destination_files.rm_rf(@remote_base_path)
+    end
+
+    after(:all) do
+      # Close the remote connection
+      @remote_test.destination_connection.close
+    end
+  
+    it "should track modifications when a file changes" do
+      @remote_test.should_receive(:track_modification!).once
+      @remote_test.empty_directory(@remote_base_path + '/test1')
+      @remote_test.empty_directory(@remote_base_path + '/test1')
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -17,8 +17,10 @@ require 'vagrant/vagrant'
 
 RSpec.configure do |config|
   config.after(:suite) do
-    # Rollback the server
-    puts "Roll back test server"
-    `cd spec/vagrant/ ; BUNDLE_GEMFILE=../../Gemfile bundle exec vagrant sandbox rollback`
+    unless ENV['TRAVIS']
+      # Rollback the server
+      puts "Roll back test server"
+      `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.0.6
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-11 00:00:00.000000000 Z
+date: 2012-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -263,6 +263,7 @@ files:
 - lib/pawnee/pawnee/base.rb
 - lib/pawnee/pawnee/cli.rb
 - lib/pawnee/pawnee/invocation.rb
+- lib/pawnee/pawnee/modified.rb
 - lib/pawnee/pawnee/parser/options.rb
 - lib/pawnee/pawnee/railtie.rb
 - lib/pawnee/pawnee/roles.rb
@@ -277,12 +278,17 @@ files:
 - 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/spec_helper.rb.tt
+- lib/pawnee/pawnee/templates/newgem/spec/vagrant/Vagrantfile.tt
+- lib/pawnee/pawnee/templates/newgem/spec/vagrant/vagrant.rb.tt
 - lib/pawnee/pawnee/version.rb
 - pawnee.gemspec
 - spec/actions/compile_spec.rb
+- spec/actions/file_spec.rb
 - spec/actions/package_spec.rb
 - spec/actions/user_spec.rb
 - spec/base_spec.rb
+- spec/modified_spec.rb
 - spec/spec_helper.rb
 - spec/vagrant/.vagrant
 - spec/vagrant/Vagrantfile
@@ -301,7 +307,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3877937215280368330
+      hash: -1028839069221412909
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -310,7 +316,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3877937215280368330
+      hash: -1028839069221412909
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.22
@@ -319,9 +325,11 @@ specification_version: 3
 summary: Better server provisioing
 test_files:
 - spec/actions/compile_spec.rb
+- spec/actions/file_spec.rb
 - spec/actions/package_spec.rb
 - spec/actions/user_spec.rb
 - spec/base_spec.rb
+- spec/modified_spec.rb
 - spec/spec_helper.rb
 - spec/vagrant/.vagrant
 - spec/vagrant/Vagrantfile