chicanery 0.0.5 → 0.0.6

data/Gemfile.lock

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

data/examples/baby_steps.rb

@@ -0,0 +1,35 @@
+require 'chicanery/git'
+
+include Chicanery::Git
+
+git_repo 'chicanery', '.', branches: [:master]
+
+def now
+  Time.now.to_i
+end
+
+def say message
+  `growlnotify -t "some new chicanery ..." --image ~/icons/chicanery.png -m \"#{message}\"`
+end
+
+start = now
+maximum = ARGV.shift.to_i
+
+say "Uncommitted changes will be automatically reverted after #{maximum} seconds"
+
+when_run do |state|
+  start = now if `git status`.chomp.split("\n").last == 'nothing to commit, working directory clean'
+  elapsed = now - start
+  if elapsed >= maximum
+    say "no commits detected in #{elapsed} seconds - reverting all uncommitted changes"
+    `afplay ~/build_sounds/ticktock.mp3`
+    `git reset --hard`
+    `git clean -d -x -f`
+    start = now
+  end
+end
+
+when_commit do |branch, commit, previous|
+  say "commit detected - resetting timer"
+  start = now
+end

data/examples/{travis.rb → chicanery.rb}

@@ -3,7 +3,7 @@ require 'chicanery/git'
 
 include Chicanery::Git
 
-git_repo 'chicanery', '.', remotes: {
+git_repo 'chicanery', '.', branches: [:master], remotes: {
   github: { url: 'git://github.com/markryall/chicanery.git' }
 }
 
@@ -13,6 +13,10 @@ def growlnotify message
   `growlnotify -t "some new chicanery ..." --image ~/icons/chicanery.png -m \"#{message}\"`
 end
 
+when_run do |state|
+  puts state.has_failure? ? "something is wrong" : "all builds are fine"
+end
+
 when_commit do |repo, commit, previous|
   growlnotify "commit #{previous}..#{commit} detected in repo #{repo}"
 end

data/lib/chicanery/cctray.rb

@@ -24,8 +24,8 @@ module Chicanery
       Nokogiri::XML(get).css("Project").each do |project|
         job = {
           activity: project[:activity] == 'Sleeping' ? :sleeping : :building,
-          last_build_status: project[:lastBuildStatus] == 'Success' ? :success : :failure,
-          last_build_time: project[:lastBuildTime].empty? ? nil : DateTime.parse(project[:lastBuildTime]),
+          last_build_status: parse_build_status(project[:lastBuildStatus]),
+          last_build_time: project[:lastBuildTime].empty? ? nil : DateTime.parse(project[:lastBuildTime]).to_time.to_i,
           url: project[:webUrl],
           last_label: project[:lastBuildLabel]
         }
@@ -34,6 +34,14 @@ module Chicanery
       jobs
     end
 
+    def parse_build_status status
+      case status
+      when /^Success/ then :success
+      when /^Unknown/ then :unknown
+      else :failure
+      end
+    end
+
     def filtered name
       return false unless options[:include]
       !options[:include].match(name)

data/lib/chicanery/git.rb

@@ -28,22 +28,25 @@ module Chicanery
         response = {}
         in_repo do
           remotes.each do |name, remote|
-            git "remote add #{name} #{remote[:url]}" unless git("remote | grep #{name}") == name.to_s
-            git "fetch -q #{name}"
             (remote[:branches] || ['master']).each do |branch|
-              response["#{name}/#{branch}"] = head "#{name}/#{branch}"
+              response["#{name}/#{branch}"] = remote_head remote[:url], branch
             end
           end
-          branches.each do |branch|
-            response[branch] = head branch
-          end
+          branches.each { |branch| response[branch] = head branch }
         end
         response
       end
 
+      def remote_head url, branch
+        sha "ls-remote #{url} #{branch}"
+      end
+
       def head branch
-        match = /^([^ ]*) /.match git "log -n 1 #{branch} --pretty=oneline"
-        match[1] if match
+        sha "log -n 1 #{branch} --pretty=oneline"
+      end
+
+      def sha command
+        git(command).split.first
       end
 
       def git command

data/lib/chicanery/summary.rb

@@ -0,0 +1,11 @@
+module Chicanery
+  module Summary
+    def has_failure?
+      self[:servers].map do |name,jobs|
+        jobs.map do |name, state|
+          state[:last_build_status] == :failure
+        end
+      end.flatten.inject(false) {|v,a| v || a}
+    end
+  end
+end

data/lib/chicanery.rb

@@ -8,6 +8,7 @@ require 'chicanery/persistence'
 require 'chicanery/collections'
 require 'chicanery/handlers'
 require 'chicanery/state_comparison'
+require 'chicanery/summary'
 
 module Chicanery
   include Persistence
@@ -15,7 +16,7 @@ module Chicanery
   include Handlers
   include StateComparison
 
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 
   def execute args
     begin
@@ -37,6 +38,7 @@ module Chicanery
           compare_jobs current_jobs, previous_state[:servers][server.name] if previous_state[:servers]
           current_state[:servers][server.name] = current_jobs
         end
+        current_state.extend Chicanery::Summary
         run_handlers.each {|handler| handler.call current_state }
         persist current_state
         break unless poll_period

data/spec/chicanery/state_comparison_spec.rb

@@ -19,8 +19,8 @@ describe Chicanery::StateComparison do
   end
 
   describe '#compare_job' do
-    let(:current_job)  { { activity: :sleeping, last_build_time: Time.now,  } }
-    let(:previous_job) { { activity: :sleeping, last_build_time: (Time.now-1) } }
+    let(:current_job)  { { activity: :sleeping, last_build_time: 10 } }
+    let(:previous_job) { { activity: :sleeping, last_build_time: 5  } }
 
     before {
       stub! :notify_failed_handlers

data/spec/chicanery/summary_spec.rb

@@ -0,0 +1,29 @@
+describe Chicanery::Summary do
+  describe '#failure?' do
+    let(:state) { {servers: {} } }
+
+    before do
+      state.extend Chicanery::Summary
+    end
+
+    it 'should be false if there are no jobs' do
+      state.should_not have_failure
+    end
+
+    it 'should be false if there are no failures' do
+      state[:servers][:server1] = {
+        job1: { last_build_status: :success },
+        job2: { last_build_status: :success }
+      }
+      state.should_not have_failure
+    end
+
+    it 'should be true if there is a single failure' do
+      state[:servers][:server1] = {
+        job1: { last_build_status: :failure },
+        job2: { last_build_status: :success }
+      }
+      state.should have_failure
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chicanery
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-09 00:00:00.000000000 Z
+date: 2012-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -108,9 +108,8 @@ files:
 - Rakefile
 - bin/chicanery
 - chicanery.gemspec
-- examples/evil.rb
-- examples/github.rb
-- examples/travis.rb
+- examples/baby_steps.rb
+- examples/chicanery.rb
 - lib/chicanery.rb
 - lib/chicanery/cctray.rb
 - lib/chicanery/collections.rb
@@ -118,9 +117,11 @@ files:
 - lib/chicanery/handlers.rb
 - lib/chicanery/persistence.rb
 - lib/chicanery/state_comparison.rb
+- lib/chicanery/summary.rb
 - spec/chicanery/collections_spec.rb
 - spec/chicanery/persistence_spec.rb
 - spec/chicanery/state_comparison_spec.rb
+- spec/chicanery/summary_spec.rb
 - spec/chicanery_spec.rb
 homepage: http://github.com/markryall/chicanery
 licenses: []
@@ -136,7 +137,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2101217152092119930
+      hash: -1603803825861310736
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -145,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2101217152092119930
+      hash: -1603803825861310736
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -156,4 +157,5 @@ test_files:
 - spec/chicanery/collections_spec.rb
 - spec/chicanery/persistence_spec.rb
 - spec/chicanery/state_comparison_spec.rb
+- spec/chicanery/summary_spec.rb
 - spec/chicanery_spec.rb

data/examples/evil.rb

@@ -1,24 +0,0 @@
-require 'chicanery/git'
-
-include Chicanery::Git
-
-git_repo 'chicanery', '.', branches: [:master]
-
-start = Time.now.to_i
-maximum = ARGV.shift.to_i
-
-puts "Uncommitted changes will be automatically reverted after #{maximum} seconds"
-
-when_run do |state|
-  elapsed = Time.now.to_i - start
-  if elapsed >= maximum
-    puts "no commits detected in #{elapsed} seconds - reverting all uncommitted changes"
-    `git reset --hard`
-    start = Time.now.to_i
-  end
-end
-
-when_commit do |branch, commit, previous|
-  puts "commit detected - resetting timer"
-  start = Time.now.to_i
-end

data/examples/github.rb

@@ -1,11 +0,0 @@
-require 'chicanery/git'
-
-include Chicanery::Git
-
-git_repo 'chicanery', '.', branches: [:master], remotes: {
-  github: { url: 'git://github.com/markryall/chicanery.git' }
-}
-
-when_commit do |branch, commit, previous|
-  puts "commit #{previous}..#{commit} detected in #{branch}"
-end