chicanery 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 846eca2bba6266d70bc2238dd6bafd85257314e0
-  data.tar.gz: f8804952b0756317edfd7c79e1dd80a3bf8206a7
+  metadata.gz: f2294bb93b469bfefc0a36b829f1d30a6c85d43a
+  data.tar.gz: 4b0a2c6565a3ae523bb748a4e3e1d00c84b4bb3b
 SHA512:
-  metadata.gz: a3182e3bc85cdabb365541063bd7ca5a403537be8661e55bdb12001fba6f583587157663323d54bf66f485a0ab277f3d026a3e09cce4adf5751c50aee6249b67
-  data.tar.gz: 00ff2db2662c9bf8a46c6ac426850453ddbe9e74d027ed36f35475cf3116f193cef0d6cc2bf2c0caadfa553c6e5559f6ceab22c460014259c61e6033a8a507a9
+  metadata.gz: ab140228326d5dc93958a6fc0b995e6dc6ab24b1ba390b7d8df48ae4d489a63f02cadee12a1030e9abad0a0467216a34a24fabaab787fdb30e3bd6e6247d47e5
+  data.tar.gz: 50d4691c8d0de15de244f1b3083d7ca4327c10ab6df4ccb01e9ef13eefdc3654234781f3012171458aa107ec05d0692dc200abe3d9d30362d222d60e7ba38c92

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    chicanery (0.1.4)
+    chicanery (0.1.5)
       nokogiri (~> 1)
 
 GEM

data/lib/chicanery.rb

@@ -16,7 +16,7 @@ module Chicanery
   include Repos
   include Sites
 
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 
   def poll_period seconds=nil
     @poll_period = seconds if seconds

data/lib/chicanery/site.rb

@@ -10,9 +10,12 @@ module Chicanery
       @name, @uri, @options = name, URI(url), options
     end
 
+    def path
+      uri.query ? "#{uri.path}?#{uri.query}" : uri.path
+    end
+
     def get
-      req = Net::HTTP::Get.new uri.path
-      req += "?#{uri.query}" if uri.query
+      req = Net::HTTP::Get.new path
       req.basic_auth options[:user], options[:password] if options[:user] and options[:password]
       http_opts = { use_ssl: uri.scheme == 'https' }
       http_opts[:verify_mode] = OpenSSL::SSL::VERIFY_NONE unless options[:verify_ssl]

data/spec/chicanery/persistence_spec.rb

@@ -1,8 +1,8 @@
 describe Chicanery::Persistence do
   include Chicanery::Persistence
 
-  let(:file) { stub 'file' }
-  let(:state) { stub 'state', to_yaml: :yaml }
+  let(:file) { double 'file' }
+  let(:state) { double 'state', to_yaml: :yaml }
 
   describe '#persist' do
     it 'should write state to disk as yaml' do

data/spec/chicanery/servers_spec.rb

@@ -23,8 +23,8 @@ describe Chicanery::Servers do
     let(:previous_job) { { activity: :sleeping, last_build_time: 5  } }
 
     before {
-      stub! :notify_failed_handlers
-      stub! :notify_succeeded_handlers
+      subject.stub :notify_failed_handlers
+      subject.stub :notify_succeeded_handlers
     }
 
     after { compare_job 'name', current_job, previous_job }

data/spec/chicanery_spec.rb

@@ -1,34 +1,36 @@
 describe Chicanery do
-  include Chicanery
+  subject { Object.new.extend Chicanery }
 
   describe '#execute' do
-    before { %w{load restore persist}.each {|m| stub! m } }
+    before do
+      %w{load restore persist}.each {|m| subject.stub m }
+    end
 
-    after { execute ['configuration'] }
+    after { subject.execute ['configuration'] }
 
     it 'should load configuration and exit immediately when nothing is configured no poll period is provided' do
-      should_receive(:load).with 'configuration'
+      subject.should_receive(:load).with 'configuration'
     end
 
     it 'should restore previous state' do
-      should_receive(:restore)
+      subject.should_receive(:restore)
     end
 
     it 'should persist new state' do
-      should_receive(:persist).with servers: {}, repos: {}, sites: {}
+      subject.should_receive(:persist).with servers: {}, repos: {}, sites: {}
     end
 
     it 'should sleep for specified time when poll period is provided' do
-      should_receive(:sleep).with(10).and_raise Interrupt
-      poll_period 10
+      subject.should_receive(:sleep).with(10).and_raise Interrupt
+      subject.poll_period 10
     end
 
     it "polls with a specified period" do
-      should_receive(:run).exactly(3).times
-      should_receive(:sleep).with(10).ordered
-      should_receive(:sleep).with(10).ordered
-      should_receive(:sleep).with(10).ordered.and_raise Interrupt
-      poll_period 10
+      subject.should_receive(:run).exactly(3).times
+      subject.should_receive(:sleep).with(10).ordered
+      subject.should_receive(:sleep).with(10).ordered
+      subject.should_receive(:sleep).with(10).ordered.and_raise Interrupt
+      subject.poll_period 10
     end
   end
 end

data/spec/embedded_chicanery_spec.rb

@@ -1,30 +1,31 @@
 describe Chicanery do
-  include Chicanery
+  subject { Object.new.extend Chicanery }
 
   describe '#run' do
-
     before do
-      server double("Server A", :name => "A", :jobs => "A jobs")
-      server double("Server B", :name => "B", :jobs => "B jobs")
-      repo  double("repo X", :name => "X", :state => "X state")
-      repo  double("repo Y", :name => "Y", :state => "Y state")
-      when_run do |current_state|
+      subject.server double("Server A", :name => "A", :jobs => "A jobs")
+      subject.server double("Server B", :name => "B", :jobs => "B jobs")
+      subject.repo  double("repo X", :name => "X", :state => "X state")
+      subject.repo  double("repo Y", :name => "Y", :state => "Y state")
+      subject.when_run do |current_state|
          @current_state = current_state
       end
       @current_state = nil
     end
 
-    before { stub!("restore").and_return({})}
-    before { %w{persist}.each {|m| stub! m } }
+    before do
+      subject.stub("restore") { {} }
+      subject.stub("persist")
+    end
 
     it "notifies when_run listeners of the current state of the servers jobs" do
-      run
+      subject.run
       @current_state[:servers]["A"].should == "A jobs"
       @current_state[:servers]["B"].should == "B jobs"
     end
 
     it "notifies when_run listeners of the current state of the repos" do
-      run
+      subject.run
       @current_state[:repos]["X"].should == "X state"
       @current_state[:repos]["Y"].should == "Y state"
     end
@@ -33,6 +34,5 @@ describe Chicanery do
     # it restores previous state and records current state
     # it compares current state and previous state for each server
     # it compares current state and previous state for each server
-
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chicanery
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Mark Ryall