guard-puppet 0.0.2 → 1.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 6a6aa836468627ae093cc9fb22ad8090427b9a74
+  data.tar.gz: 78abc5d1a94331a205bfda80132cdc8ce88eafc6
+SHA512:
+  metadata.gz: 880a53421e56161690f2fd5290c626e7815bbab3115dc1ea79c4d9078f420cec7372f3ade6d657789b754d8fbce0d07aa681b6bb872c6e793e7cc0951c1f29d8
+  data.tar.gz: 28698c09a3efa6aaa0a3cfa4e813e16f6828d6c0213011b186aac04e1db50ba3dc7e873e53c0f76d70d8c4c8fbdb4cc3cbf2c1277f5c8e005b913234306927f7

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--format progress

data/Gemfile

@@ -1,9 +1,23 @@
 source "http://rubygems.org"
 
 # Specify your gem's dependencies in guard-puppet.gemspec
-gemspec
+gemspec development_group: :gem_build_tools
 
-require 'rbconfig'
-if RbConfig::CONFIG['host_os'] =~ /linux/
-  gem 'libnotify'
+group :development do
+  gem 'guard', '~> 2.12'
+  gem 'guard-rspec', '~> 4.5'
+
+  require 'rbconfig'
+  if RbConfig::CONFIG['host_os'] =~ /linux/
+    gem 'libnotify'
+  end
+end
+
+group :test do
+  gem 'rspec', '~> 2.99'
+  gem 'mocha'
+end
+
+group :gem_build_tools do
+  gem 'rake'
 end

data/Guardfile

@@ -1,9 +1,28 @@
 # A sample Guardfile
 # More info at https://github.com/guard/guard#readme
 
-guard 'rspec', :version => 2 do
-  watch(%r{^spec/.+_spec\.rb$})
-  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
-  watch('spec/spec_helper.rb')  { "spec" }
-end
+# Note: The cmd option is now required due to the increasing number of ways
+#       rspec may be run, below are examples of the most common uses.
+#  * bundler: 'bundle exec rspec'
+#  * bundler binstubs: 'bin/rspec'
+#  * spring: 'bin/rspec' (This will use spring if running and you have
+#                          installed the spring binstubs per the docs)
+#  * zeus: 'zeus rspec' (requires the server to be started separately)
+#  * 'just' rspec: 'rspec'
+
+guard :rspec, cmd: "bundle exec rspec" do
+  require "guard/rspec/dsl"
+  dsl = Guard::RSpec::Dsl.new(self)
+
+  # Feel free to open issues for suggestions and improvements
 
+  # RSpec files
+  rspec = dsl.rspec
+  watch(rspec.spec_helper) { rspec.spec_dir }
+  watch(rspec.spec_support) { rspec.spec_dir }
+  watch(rspec.spec_files)
+
+  # Ruby files
+  ruby = dsl.ruby
+  dsl.watch_spec_files_for(ruby.lib_files)
+end

data/README.md

@@ -10,8 +10,9 @@ It's assumed your configs are all in the current folder, which is the
 equivalent of `--confdir=$PWD` at the command line. Otherwise,
 there's not much use of using Guard with Puppet. :)
 
-Three options so far:
+Four options so far:
 
+* `:run_on_start`: Apply Puppet configs when starting Guard (default: `false`)
 * `:verbose`: Show more output from Puppet (default: `true`)
 * `:debug`: Show even more output from Puppet (default: `false`)
 * `:manifest`: The main manifest file to run (default: `manifests/site.pp`)

data/Rakefile

@@ -1 +1,9 @@
+include Rake::DSL if defined?(Rake::DSL)
+
 require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec)
+
+task :default => 'spec'
+

data/guard-puppet.gemspec

@@ -7,20 +7,16 @@ Gem::Specification.new do |s|
   s.version     = Guard::PuppetVersion::VERSION
   s.authors     = ["John Bintz"]
   s.email       = ["john@coswellproductions.com"]
-  s.homepage    = ""
+  s.license     = "MIT"
+  s.homepage    = "https://github.com/guard/guard-puppet"
   s.summary     = %q{Reapply Puppet configs automatically using Guard.}
-  s.description = %q{Reapply Puppet configs automatically using Guard.}
-
-  s.rubyforge_project = "guard-puppet"
+  s.description = %q{Guard plugin to reapply Puppet configurations.}
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency 'guard'
-  s.add_dependency 'puppet'
-
-  s.add_development_dependency 'rspec', '~> 2.6.0'
-  s.add_development_dependency 'mocha'
+  s.add_dependency 'guard-compat', '~> 1.2'
+  s.add_dependency 'puppet', '~> 4.1'
 end

data/lib/guard/puppet.rb

@@ -1,16 +1,17 @@
-require 'guard/guard'
+require 'guard/compat/plugin'
 
-module ::Guard
-  class Puppet < ::Guard::Guard
+module Guard
+  class Puppet < Plugin
     class << self
       attr_accessor :is_wrapping_exit
     end
 
-    def initialize(watchers = [], options = {})
+    def initialize(options = {})
       super
       @options = options
 
       UI.info "Guard::Puppet is watching for changes..."
+      run_all if options[:run_on_start]
     end
 
     def run_all

data/lib/guard/puppet/runner.rb

@@ -21,6 +21,12 @@ module Guard
 
         begin
           maybe_bundle_with_env do
+            # TODO: hack, untested, needed to avoid:
+            #
+            #"Error: Could not initialize global default settings:
+            #  Attempting to initialize global default settings more than once!"
+            ::Puppet.settings.send(:clear_everything_for_tests)
+
             ::Puppet::Util::CommandLine.new('puppet', command_line_params).execute
           end
           0
@@ -50,7 +56,7 @@ module Guard
       private
       def maybe_bundle_with_env(&block)
         if defined?(::Bundler)
-          Bundler.with_clean_env(&block)
+          ::Bundler.with_clean_env(&block)
         else
           yield
         end

data/lib/guard/puppet/version.rb

@@ -1,5 +1,5 @@
 module Guard
   module PuppetVersion
-    VERSION = '0.0.2'
+    VERSION = '1.0.0'
   end
 end

data/spec/lib/guard/puppet/runner_spec.rb

@@ -32,11 +32,11 @@ describe Guard::Puppet::Runner do
   end
 
   describe '#run' do
-    before do
-      ::Puppet::Util::CommandLine.expects(:new).raises(SystemExit.new(return_value))
-    end
-
     context 'returns a non-zero value' do
+      before do
+        ::Puppet::Util::CommandLine.expects(:new).raises(SystemExit.new(return_value))
+      end
+
       let(:return_value) { 10 }
 
       it 'should return the result of an exit call' do
@@ -44,6 +44,27 @@ describe Guard::Puppet::Runner do
       end
     end
 
+    context 'when bundler is used' do
+      before do
+        module ::Guard
+          class Bundler
+            def self.with_clean_env
+              fail "Called with_clean_env on Guard::Bundler instead of Bundler"
+            end
+          end
+        end
+      end
+
+      it 'uses a clean env' do
+        ran = false
+        ::Bundler.stubs(:with_clean_env).with() do
+          ran = true
+        end
+        runner.run
+        ran.should == true
+      end
+    end
+
     context 'returns a zero value' do
       let(:return_value) { 0 }
       let(:messages) do

data/spec/lib/guard/puppet_spec.rb

@@ -1,9 +1,30 @@
 require 'spec_helper'
+require 'guard/compat/test/helper'
 require 'guard/puppet'
 
 describe Guard::Puppet do
   let(:guard) { described_class.new }
 
+  describe '#initialize' do
+    before do
+      Guard::UI.stubs(:info)
+    end
+
+    context 'without :run_on_start' do
+      it 'should not run anything' do
+        described_class.new
+      end
+    end
+
+    context 'with :run_on_start' do
+      it 'should run Puppet on start' do
+        Guard::Puppet.any_instance.expects(:run_all)
+
+        described_class.new(:run_on_start => true)
+      end
+    end
+  end
+
   describe '#run_all' do
     before do
       Guard::UI.stubs(:info)

metadata

@@ -1,73 +1,52 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: guard-puppet
-version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.0.2
+version: !ruby/object:Gem::Version
+  version: 1.0.0
 platform: ruby
-authors: 
+authors:
 - John Bintz
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-06 00:00:00 -04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: guard
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+date: 2015-06-10 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: guard-compat
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: puppet
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: puppet
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.1'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rspec
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 2.6.0
-  type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: mocha
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-  type: :development
-  version_requirements: *id004
-description: Reapply Puppet configs automatically using Guard.
-email: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.1'
+description: Guard plugin to reapply Puppet configurations.
+email:
 - john@coswellproductions.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- .gitignore
+files:
+- ".gitignore"
+- ".rspec"
 - Gemfile
 - Guardfile
 - README.md
@@ -82,36 +61,28 @@ files:
 - spec/lib/guard/puppet/runner_spec.rb
 - spec/lib/guard/puppet_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
-homepage: ""
-licenses: []
-
+homepage: https://github.com/guard/guard-puppet
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
-rubyforge_project: guard-puppet
-rubygems_version: 1.6.2
+rubyforge_project: 
+rubygems_version: 2.4.7
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Reapply Puppet configs automatically using Guard.
-test_files: 
-- spec/lib/guard/puppet/log_spec.rb
-- spec/lib/guard/puppet/runner_spec.rb
-- spec/lib/guard/puppet_spec.rb
-- spec/spec_helper.rb
+test_files: []