runpuppet 0.5.15 → 0.5.16

data/README.rdoc

@@ -6,9 +6,13 @@ cat /etc/runpuppet.yml:
     command:cd /etc/puppet/repo && git fetch && git checkout -f origin/@@branch@@ && puppet -v --debug --logdest console --modulepath /etc/puppet/repo/modules /etc/puppet/repo/manifests/site.pp
     branch: staging
     local_ip: 192.168.10.10
+    >>>> or grab IP from a network interface
+    local_ip_interface: vmbr0
     lock_file: /tmp/runpuppet.lock
 
 
+
+
 This is the companion for our puppet_controller, a light-weight web-service to coordinate local puppet runs on servers.
 
 == Contributing to runpuppet

data/VERSION

@@ -1 +1 @@
-0.5.15
+0.5.16

data/bin/runpuppet

@@ -19,6 +19,7 @@ Options:
 BANNER
 
   opts.on("-h", "--help","Show this.") { puts opts; exit }
+  opts.on("--readme", 'Show Readme'){ puts File.read(File.join(File.dirname(__FILE__), '..', 'README.rdoc')); exit }
   opts.on('-v', '--version','Show Version'){ puts Runpuppet::VERSION; exit}
   opts.on('--try','Runs only if selected on puppet_controller'){ options[:try] = true }
   opts.on('-f', '--facts','Report facts'){ options[:facts] = true }

data/lib/runpuppet.rb

@@ -40,10 +40,10 @@ class Runpuppet
     begin
       url = Config.puppet_controller_url + path
       puts "Getting #{url}" if options[:verbose]
-      open(url , {:http_basic_authentication =>Config.puppet_controller_auth} )
+      RestClient.get(url)
     rescue Exception => e
       puts e.inspect
-      puts "WARNING: error connecting to puppet controller!"
+      puts "WARNING: error connecting in GET (PuppetMaster)"
     end
   end
 
@@ -55,7 +55,7 @@ class Runpuppet
       RestClient.post "#{Config.puppet_controller_url}/puppet/#{path}", params
     rescue Exception => e
       puts e.inspect
-      puts "WARNING: error connecting to puppet controller!"
+      puts "WARNING: error connecting in POST (PuppetMaster)"
     end
   end
 
@@ -131,11 +131,20 @@ class Runpuppet
         require 'facter'
         require 'facter/ec2'
         ip = Facter.value("ec2_public_ipv4")
+      elsif config['local_ip_interface']
+        parse_local_ip_from_interface
       else
         %x(ifconfig)[/192.168.\d+.\d+/] || config['local_ip']
       end
     end
 
+
+    def self.parse_local_ip_from_interface
+      # %x(ifconfig #{config['local_ip_interface']}).lines.grep(/inet addr/).first.match(/addr:(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})?/)
+      %x(ip addr list #{config['local_ip_interface']}).match(/inet (\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})?/)
+      return $1
+    end
+
     def self.is_ec2?
       %x(arp -n -i eth0) =~ /fe:ff:ff:ff:ff/
     end

data/runpuppet.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{runpuppet}
-  s.version = "0.5.15"
+  s.version = "0.5.16"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Roman Heinrich}]
-  s.date = %q{2012-02-09}
+  s.date = %q{2012-04-27}
   s.description = %q{Is the local client to the puppet_controller}
   s.email = %q{roman.heinrich@gmail.com}
   s.executables = [%q{runpuppet}]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: runpuppet
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 43
   prerelease: 
   segments: 
   - 0
   - 5
-  - 15
-  version: 0.5.15
+  - 16
+  version: 0.5.16
 platform: ruby
 authors: 
 - Roman Heinrich
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-09 00:00:00 Z
+date: 2012-04-27 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement