runpuppet 1.0.0 → 1.0.1

data/README.md

@@ -46,7 +46,7 @@ This is the companion for our puppet_controller, a light-weight web-service to c
 
 ### Release the gem
     # on master branch
-    $ sh/release
+    $ sh/release VERSION
 
 
 ## Contributing to runpuppet

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.0.1

data/lib/runpuppet/agent.rb

@@ -11,9 +11,16 @@ module Runpuppet
 ##### puppet
 
     def check_status
-      action, branch = get("/puppet/run", @run_options).split('-') rescue []
-      branch ||= (run_options[:branch] || config.default_branch)
-      return action, branch
+      begin
+        r = get("/puppet/run")
+      rescue Exception => e
+      end
+
+      if r
+        return (action, branch = *r.split('-'))
+      else
+        return nil
+      end
     end
 
     def report_start

data/lib/runpuppet/client.rb

@@ -13,8 +13,8 @@ module Runpuppet
 
     def run
       with_lock(config.lock_file) do
-        action, branch = agent.check_status
-        if should_run?(action)
+        action, branch = calculate_run_params
+        if action == 'run'
           agent.report_start
           log "run #{branch}"
 
@@ -30,6 +30,19 @@ module Runpuppet
       end
     end
 
+    def calculate_run_params
+      (local_run_params || remote_run_params)
+    end
+
+    def local_run_params
+      return nil if run_options[:try]
+      return 'run', (run_options[:branch] ||config.default_branch)
+    end
+
+    def remote_run_params
+      agent.check_status
+    end
+
     def run_command(branch)
       cmd = if run_options[:verbose]
         config.verbose_command
@@ -39,11 +52,6 @@ module Runpuppet
       cmd.gsub('@@branch@@', branch)
     end
 
-    def should_run?(action)
-      ## always run if started without --try
-      (!run_options[:try] or action == 'run')
-    end
-
     def with_lock(lock_file)
       recently_locked = (File.exists?(lock_file) and File.mtime(lock_file) > Time.now - 15*60)
 

data/runpuppet.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "runpuppet"
-  s.version = "1.0.0"
+  s.version = "1.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Roman Heinrich"]

data/test/agent_test.rb

@@ -2,7 +2,8 @@ require 'test/helper'
 
 describe "Runpuppet::Agent" do
   before do
-    @agent = TestContext.agent
+    @ctx   = Dim::Container.new(TestContext)
+    @agent = @ctx.agent
   end
 
   describe :check_status do
@@ -10,6 +11,11 @@ describe "Runpuppet::Agent" do
       @agent.stubs(:get).returns('run-master')
       @agent.check_status.must_equal ["run", "master"]
     end
+
+    it "returns nil for errors" do
+      @agent.stubs(:get).raises(RuntimeError)
+      @agent.check_status.must_be_nil
+    end
   end
 
   describe :base_url do
@@ -20,8 +26,8 @@ describe "Runpuppet::Agent" do
 
   describe "URL manipulation" do
     before do
-      TestContext.config.stubs(:local_ip).returns('10.10.10.10')
-      TestContext.config.stubs(:hostname).returns('example-vm')
+      @ctx.config.stubs(:local_ip).returns('10.10.10.10')
+      @ctx.config.stubs(:hostname).returns('example-vm')
     end
 
 

data/test/client_test.rb

@@ -18,20 +18,23 @@ describe "Client" do
     end
   end
 
-  describe :should_run? do
+  describe :local_run_params do
     it "always runs without --try option" do
       @ctx.register(:run_options){ {:try => false} }
-      @ctx.client.should_run?('branch_does_not_matter').must_equal true
+      @ctx.client.local_run_params.must_equal ["run", "master"]
     end
 
-    it "runs with --try option only for 'run' action" do
+    it "is nil with --try option" do
       @ctx.register(:run_options){ {:try => true} }
-      @ctx.client.should_run?('run').must_equal true
+      @ctx.client.local_run_params.must_be_nil
     end
+  end
 
-    it "does not run with --try option, if not 'run' action" do
+  describe :remote_run_params do
+    it "always runs without --try option" do
       @ctx.register(:run_options){ {:try => true} }
-      @ctx.client.should_run?('some_random_action').must_equal false
+      @ctx.client.stubs(:remote_run_params).returns(["run", "master"])
+      @ctx.client.calculate_run_params.must_equal ['run', 'master']
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: runpuppet
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 1
   - 0
-  - 0
-  version: 1.0.0
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - Roman Heinrich