runpuppet 1.0.0.rc6 → 1.0.0

data/{README.rdoc → README.md}

@@ -1,43 +1,55 @@
-= runpuppet
+# runpuppet
 
+This is the companion for our puppet_controller, a light-weight web-service to coordinate local puppet runs on servers.
+
+### Installation
+
+    $ gem install runpuppet
+
+
+### Config
+    $ cat /etc/runpuppet.yml:
 
-cat /etc/runpuppet.yml:
     puppet_controller_url: http://user:pass@example.com
-    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
+    command:cd /etc/puppet/repo && git fetch && git checkout -f origin/@@branch@@ && puppet apply /etc/puppet/repo/manifests/site.pp
+    verbose_command:cd /etc/puppet/repo && git fetch && git checkout -f origin/@@branch@@ && puppet apply -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
 
+## Development
 
 ### Run tests
 
-   sh/test
+    $ sh/test
 
 
-#### Start console
+### Start console
 
-   sh/c
+    $ sh/c
 
-#### Playing in console
+### Playing in console
 
-   @ctx = Runpuppet.setup_context({})
+    @ctx = Runpuppet.setup_context({})
 
-   # client
-   @ctx.client
+    # client
+    @ctx.client
 
-   # config
-   @ctx.config
+    # config
+    @ctx.config
 
-   # agent ### HTTP agent
-   @ctx.agent
+    # agent ### HTTP agent
+    @ctx.agent
 
 
+### Release the gem
+    # on master branch
+    $ sh/release
 
-This is the companion for our puppet_controller, a light-weight web-service to coordinate local puppet runs on servers.
 
-== Contributing to runpuppet
+## Contributing to runpuppet
 
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet
 * Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it
@@ -47,7 +59,7 @@ This is the companion for our puppet_controller, a light-weight web-service to c
 * Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
 * Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
 
-== Copyright
+## Copyright
 
 Copyright (c) 2012 Roman Heinrich. See LICENSE.txt for
 further details.

data/VERSION

@@ -1 +1 @@
-1.0.0.rc6
+1.0.0

data/bin/runpuppet

@@ -19,7 +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("--readme", 'Show Readme'){ puts File.read(File.join(File.dirname(__FILE__), '..', 'README.md')); exit }
   opts.on('--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/runpuppet.gemspec

@@ -5,9 +5,9 @@
 
 Gem::Specification.new do |s|
   s.name = "runpuppet"
-  s.version = "1.0.0.rc6"
+  s.version = "1.0.0"
 
-  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Roman Heinrich"]
   s.date = "2012-11-09"
   s.description = "Is the local client to the puppet_controller"
@@ -15,14 +15,14 @@ Gem::Specification.new do |s|
   s.executables = ["runpuppet"]
   s.extra_rdoc_files = [
     "LICENSE.txt",
-    "README.rdoc"
+    "README.md"
   ]
   s.files = [
     ".document",
     "Gemfile",
     "Gemfile.lock",
     "LICENSE.txt",
-    "README.rdoc",
+    "README.md",
     "Rakefile",
     "VERSION",
     "bin/runpuppet",
@@ -43,7 +43,8 @@ Gem::Specification.new do |s|
     "test/client_test.rb",
     "test/config_test.rb",
     "test/fixtures/runpuppet.yml",
-    "test/fixtures/shell/arp_eth0.txt",
+    "test/fixtures/shell/arp_eth0_dc.txt",
+    "test/fixtures/shell/arp_eth0_ec2.txt",
     "test/fixtures/shell/ip_addr_list_eth0.txt",
     "test/helper.rb"
   ]

data/test/config_test.rb

@@ -53,10 +53,15 @@ describe 'Config' do
   end
 
   describe :is_ec2? do
-    it 'works' do
-      @config.stubs(:read_shell).returns(shell_fixture('arp_eth0.txt'))
+    it 'is true for arp output from EC2' do
+      @config.stubs(:read_shell).returns(shell_fixture('arp_eth0_ec2.txt'))
       @config.is_ec2?.must_be :>, 0
     end
+
+    it 'is false for arp output from another data center' do
+      @config.stubs(:read_shell).returns(shell_fixture('arp_eth0_dc.txt'))
+      @config.is_ec2?.must_be_nil
+    end
   end
 
   describe :parse_local_ip_from_interface do

data/test/fixtures/shell/arp_eth0_dc.txt

@@ -0,0 +1,7 @@
+Address                  HWtype  HWaddress           Flags Mask            Iface
+10.10.40.1               ether   fa:16:3e:59:8d:93   C                     eth0
+10.10.40.4               ether   fa:16:3e:6f:fc:3b   C                     eth0
+10.10.40.12              ether   fa:16:3e:63:ee:8f   C                     eth0
+10.10.40.64              ether   fa:16:3e:52:ad:58   C                     eth0
+10.10.40.54              ether   fa:16:3e:05:12:b0   C                     eth0
+10.10.40.61              ether   fa:16:3e:41:c3:89   C                     eth0

data/test/fixtures/shell/arp_eth0_ec2.txt

@@ -0,0 +1,2 @@
+Address                  HWtype  HWaddress           Flags Mask            Iface
+10.228.26.1              ether   fe:ff:ff:ff:ff:ff   C                     eth0

data/test/fixtures/shell/ip_addr_list_eth0.txt

@@ -1,5 +1,5 @@
 2: eth0: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc pfifo_fast state UP qlen 1000
-    link/ether 08:00:27:9f:ac:82 brd ff:ff:ff:ff:ff:ff
-    inet 10.10.10.10/24 scope host lo
-    inet6 fe80::a00:27ff:fe9f:ac82/64 scope link
+    link/ether fa:16:3e:55:5a:80 brd ff:ff:ff:ff:ff:ff
+    inet 10.10.10.10/24 brd 10.10.10.255 scope global eth0
+    inet6 fe80::f816:3eff:fe55:5a80/64 scope link tentative dadfailed
        valid_lft forever preferred_lft forever

data/test/helper.rb

@@ -35,7 +35,7 @@ def create_test_context(options={})
   end
 
   ctx.register(:run_options) do
-    {}
+    options
   end
 
   ctx.register(:logger) do

metadata

@@ -1,15 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: runpuppet
 version: !ruby/object:Gem::Version 
-  hash: 2627315363
-  prerelease: 6
+  hash: 23
+  prerelease: 
   segments: 
   - 1
   - 0
   - 0
-  - rc
-  - 6
-  version: 1.0.0.rc6
+  version: 1.0.0
 platform: ruby
 authors: 
 - Roman Heinrich
@@ -131,13 +129,13 @@ extensions: []
 
 extra_rdoc_files: 
 - LICENSE.txt
-- README.rdoc
+- README.md
 files: 
 - .document
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
-- README.rdoc
+- README.md
 - Rakefile
 - VERSION
 - bin/runpuppet
@@ -158,7 +156,8 @@ files:
 - test/client_test.rb
 - test/config_test.rb
 - test/fixtures/runpuppet.yml
-- test/fixtures/shell/arp_eth0.txt
+- test/fixtures/shell/arp_eth0_dc.txt
+- test/fixtures/shell/arp_eth0_ec2.txt
 - test/fixtures/shell/ip_addr_list_eth0.txt
 - test/helper.rb
 homepage: http://github.com/dawanda/runpuppet
@@ -181,14 +180,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: 

data/test/fixtures/shell/arp_eth0.txt

@@ -1,2 +0,0 @@
-asdlkjalksdjlkj
-fe:ff:ff:ff:ff