gorgon 0.6.3 → 0.6.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MTViM2NjYzRkNjYyNGVkNDVkNWY3Y2FkMGU3NzY3OThhNGUyYWFmNg==
+    MTQ3N2NjZTA4ZDU2MWY0NGY0NTc5MDM2ZWViMTQ5MzNkYzI1MDA4OQ==
   data.tar.gz: !binary |-
-    OTZkNzg0NDk5ZmQxOTdlY2FjZDdhOGFhODUyNGNjN2EwNGU2MGZiMg==
+    Yzc5NTA4MjE5MGMzMTMxMzQ1NTg1YTY4NjI3YWM0ZTJmMGIxMDNjYg==
 SHA512:
   metadata.gz: !binary |-
-    YjcxMTdkNjlmMmI2YWE4OGI0N2MzY2Y5MjQ4ODI0YTRlNWY2NTI5NGY2ZWUy
-    NWUyMWE4ZDIzMDc2NzM1NmY1MDU0NzFhNjY3ZTBiZTVhMTliZDUzOTQ2MTk5
-    ODEyM2I4NWY1ZjY5OTM5NzllZmFiMjRlZDRmYTNlZWVkZDIxN2Y=
+    ZDEyNTMxODUwZWU3MTllNmJmMzNiMWI2N2ZkYWYyZWQxNGEzNWIyMWExMjQ4
+    MDJhZDQ0OGVlZTdmMDNjMjQxOWMxMzZiYTQyOGVmNmVlNDUzNjg3OTZhNGYx
+    NzhhMWUzMmNjMTgwMzMzZWVjMjJmYTU4ZTk3OWNmYjE0MDFmMzc=
   data.tar.gz: !binary |-
-    ZTc3YmM5YjIwNjNmZGE2NTFmYTJkZmY0OWYxYTAxY2E0OTE2ODcwMTc1ZmEz
-    NzQ3NmI1ZWJkYzhiZTI5Mzg0MjJjZDg4OTllMTY1N2YxOTEyYzNkNGZhZmU5
-    Y2VhZTFlMTUzNmE3Y2FjOTA3NDY2OWMyNWY2NDMwZTUwODcwMzI=
+    MmQ3MGMzY2UyZWYwYzg3YmJmZGU3NTMxN2UyN2VhMGRhMDIyYzUzMTRjMjc5
+    NmYxODZmODczMjY2Y2UwMDBkNmRiNzA4MjNiZmNkOGNmZGM1MTBkOWVkZDBi
+    NjQ4ZWRkYmY2MTYxYWE3OWNkNzAxMDIzYTY4MThmZDQ0NDZjZmQ=

data/.ruby-version

@@ -0,0 +1 @@
+ruby-1.9.3-p484

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gorgon (0.6.3)
+    gorgon (0.6.4)
       amqp (~> 1.1.0)
       awesome_print
       colorize (~> 0.5.8)
@@ -13,15 +13,15 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    amq-protocol (1.9.0)
-    amqp (1.1.5)
-      amq-protocol (>= 1.9.0)
+    amq-protocol (1.9.2)
+    amqp (1.1.8)
+      amq-protocol (>= 1.9.2)
       eventmachine
     awesome_print (1.2.0)
     colorize (0.5.8)
     diff-lcs (1.1.3)
     eventmachine (1.0.3)
-    open4 (1.3.0)
+    open4 (1.3.3)
     rake (0.9.2.2)
     rspec (2.11.0)
       rspec-core (~> 2.11.0)

data/README.md

@@ -1,6 +1,8 @@
 Gorgon
 =====================
 
+[![Code Climate](https://codeclimate.com/github/Fitzsimmons/Gorgon.png)](https://codeclimate.com/github/Fitzsimmons/Gorgon)
+
 About
 ---------------------
 

data/lib/gorgon/g_logger.rb

@@ -1,13 +1,15 @@
 require "logger"
 
 module GLogger
+  SIZE_1_MB = 1048576
+
   def initialize_logger log_file
     return unless log_file
     @logger =
       if log_file == "-"
         Logger.new($stdout)
       else
-        Logger.new(log_file)
+        Logger.new(log_file, 1, SIZE_1_MB)
       end
     @logger.datetime_format = "%Y-%m-%d %H:%M:%S "
   end

data/lib/gorgon/originator.rb

@@ -5,6 +5,7 @@ require 'gorgon/progress_bar_view'
 require 'gorgon/originator_logger'
 require 'gorgon/failures_printer'
 require 'gorgon/rsync_daemon'
+require 'gorgon/shutdown_manager.rb'
 
 require 'awesome_print'
 require 'etc'
@@ -31,24 +32,22 @@ class Originator
       puts $!.backtrace.join("\n")
       puts "----------------------------------"
       puts "Now attempting to cancel the job."
-      @logger.log_error "Unhandled Exception!"
+      @logger.log_error "Unhandled Exception!" if @logger
       cancel_job
     end
   end
 
+  def cancel_job
+    ShutdownManager.new(protocol: @protocol,
+                        job_state: @job_state,
+                        rsync_daemon: @rsync_daemon).cancel_job
+  end
+
   def ctrl_c
     puts "\nCtrl-C received! Just wait a moment while I clean up..."
     cancel_job
   end
 
-  def cancel_job
-    @protocol.cancel_job
-    @job_state.cancel
-
-    @protocol.disconnect
-    @rsync_daemon.stop
-  end
-
   def publish
     @logger = OriginatorLogger.new configuration[:originator_log_file]
 

data/lib/gorgon/originator_protocol.rb

@@ -45,13 +45,13 @@ class OriginatorProtocol
 
   def cancel_job
     @file_queue.purge if @file_queue
-    @channel.fanout("gorgon.worker_managers").publish(cancel_message)
+    @channel.fanout("gorgon.worker_managers").publish(cancel_message) if @channel
     @logger.log "Cancel Message sent"
   end
 
   def disconnect
     cleanup_queues_and_exchange
-    @connection.disconnect
+    @connection.disconnect if @connection
   end
 
   private

data/lib/gorgon/shutdown_manager.rb

@@ -0,0 +1,32 @@
+class ShutdownManager
+
+  def initialize(args)
+    @protocol = args.fetch(:protocol)
+    @job_state = args.fetch(:job_state)
+    @rsync_daemon = args.fetch(:rsync_daemon)
+  end
+
+  def cancel_job
+    @protocol.cancel_job if @protocol
+  ensure
+    cancel_job_state
+  end
+
+  private
+
+  def cancel_job_state
+    @job_state.cancel if @job_state
+  ensure
+    disconnect_protocol
+  end
+
+  def disconnect_protocol
+    @protocol.disconnect if @protocol
+  ensure
+    stop_rsync_daemon
+  end
+
+  def stop_rsync_daemon
+    @rsync_daemon.stop if @rsync_daemon
+  end
+end

data/lib/gorgon/version.rb

@@ -1,3 +1,3 @@
 module Gorgon
-  VERSION = "0.6.3"
+  VERSION = "0.6.4"
 end

data/spec/acceptance/run_tests_spec.rb

@@ -0,0 +1,9 @@
+require 'acceptance_spec_helper'
+
+describe 'Gorgon' do
+  it 'run tests' do
+    pending 'Use a different observer of job_state to check expectations'
+
+    run_originator
+  end
+end

data/spec/acceptance_spec_helper.rb

@@ -0,0 +1,7 @@
+$:.unshift File.expand_path("../../lib", __FILE__)
+require "gorgon"
+require File.expand_path("../support/originator_handler", __FILE__)
+
+RSpec.configure do |config|
+  config.include OriginatorHandler
+end

data/spec/listener_spec.rb

@@ -38,7 +38,7 @@ describe Listener do
       end
 
       it "should use 'log_file' from the configuration as the log file" do
-        Logger.should_receive(:new).with('listener.log')
+        Logger.should_receive(:new).with('listener.log', anything, anything)
         Listener.new
       end
 

data/spec/originator_spec.rb

@@ -60,22 +60,14 @@ describe Originator do
       stub_methods
     end
 
-    it "call JobState#cancel" do
+    it 'tells ShutdownManager to cancel_job' do
+      shutdown_manager = double('ShutdownManager')
       JobState.stub!(:new).and_return job_state
-      job_state.should_receive(:cancel)
-      @originator.publish
-      @originator.cancel_job
-    end
-
-    it "tells @protocol to cancel job and disconnect" do
-      protocol.should_receive(:cancel_job)
-      protocol.should_receive(:disconnect)
-      @originator.publish
-      @originator.cancel_job
-    end
 
-    it "stops the rsync daemon" do
-      rsync_daemon.should_receive(:stop)
+      ShutdownManager.should_receive(:new).
+          with(hash_including(protocol: protocol, job_state: job_state, rsync_daemon: rsync_daemon)).
+          and_return(shutdown_manager)
+      shutdown_manager.should_receive(:cancel_job)
 
       @originator.publish
       @originator.cancel_job
@@ -121,7 +113,7 @@ describe Originator do
     end
 
     it "calls JobState#file_started if payload[:action] is 'start'" do
-      payload = Yajl::Parser.new(:symbolize_keys => true).parse(start_payload)
+      Yajl::Parser.new(:symbolize_keys => true).parse(start_payload)
       job_state.should_receive(:file_started)
       @originator.handle_reply(start_payload)
     end

data/spec/shutdown_manager_spec.rb

@@ -0,0 +1,49 @@
+require 'gorgon/shutdown_manager'
+
+describe ShutdownManager do
+  let(:protocol){ stub("Originator Protocol", :cancel_job => nil, :disconnect => nil)}
+
+  let(:job_state){ stub("JobState", cancel: nil)}
+  let(:rsync_daemon) { stub("Rsync Daemon", :stop => true)}
+
+  describe '#cancel_job' do
+    it "call JobState#cancel" do
+      job_state.should_receive(:cancel)
+
+      shutdown_manager(job_state: job_state).cancel_job
+    end
+
+    it "tells @protocol to cancel job and disconnect" do
+      protocol.should_receive(:cancel_job)
+      protocol.should_receive(:disconnect)
+
+      shutdown_manager(protocol: protocol).cancel_job
+    end
+
+    it "stops the rsync daemon" do
+      rsync_daemon.should_receive(:stop)
+
+      shutdown_manager(rsync_daemon: rsync_daemon).cancel_job
+    end
+
+    it 'finishes cancelling job even when some cancelling steps fail' do
+      protocol.should_receive(:cancel_job).and_raise StandardError
+      job_state.should_receive(:cancel).and_raise StandardError
+      protocol.should_receive(:disconnect).and_raise StandardError
+      rsync_daemon.should_receive(:stop).and_raise StandardError
+
+      expect {
+        shutdown_manager(protocol: protocol, job_state: job_state, rsync_daemon: rsync_daemon).cancel_job
+      }.to raise_error StandardError
+    end
+  end
+
+  def shutdown_manager(args)
+    defaults = {
+        protocol: protocol,
+        job_state: job_state,
+        rsync_daemon: rsync_daemon
+    }
+    ShutdownManager.new(defaults.merge(args))
+  end
+end

data/spec/support/mock_app/.gitignore

@@ -0,0 +1,15 @@
+# See http://help.github.com/ignore-files/ for more about ignoring files.
+#
+# If you find yourself ignoring temporary files generated by your text editor
+# or operating system, you probably want to add a global ignore instead:
+#   git config --global core.excludesfile ~/.gitignore_global
+
+# Ignore bundler config
+/.bundle
+
+# Ignore the default SQLite database.
+/db/*.sqlite3
+
+# Ignore all logfiles and tempfiles.
+/log/*.log
+/tmp

data/spec/support/mock_app/Gemfile

@@ -0,0 +1,39 @@
+source 'https://rubygems.org'
+
+gem 'rails', '3.2.11'
+
+# Bundle edge Rails instead:
+# gem 'rails', :git => 'git://github.com/rails/rails.git'
+
+gem 'sqlite3'
+
+
+# Gems used only for assets and not required
+# in production environments by default.
+group :assets do
+  gem 'sass-rails',   '~> 3.2.3'
+  gem 'coffee-rails', '~> 3.2.1'
+
+  # See https://github.com/sstephenson/execjs#readme for more supported runtimes
+  # gem 'therubyracer', :platforms => :ruby
+
+  gem 'uglifier', '>= 1.0.3'
+end
+
+gem 'jquery-rails'
+gem 'gorgon', path: '../../../'
+
+# To use ActiveModel has_secure_password
+# gem 'bcrypt-ruby', '~> 3.0.0'
+
+# To use Jbuilder templates for JSON
+# gem 'jbuilder'
+
+# Use unicorn as the app server
+# gem 'unicorn'
+
+# Deploy with Capistrano
+# gem 'capistrano'
+
+# To use debugger
+# gem 'debugger'

data/spec/support/mock_app/Gemfile.lock

@@ -0,0 +1,135 @@
+PATH
+  remote: ../../../
+  specs:
+    gorgon (0.7.0.pre)
+      amqp (~> 1.1.0)
+      awesome_print
+      colorize (~> 0.5.8)
+      open4 (~> 1.3.0)
+      ruby-progressbar (~> 1.0.1)
+      uuidtools (= 2.1.3)
+      yajl-ruby (= 1.1.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionmailer (3.2.11)
+      actionpack (= 3.2.11)
+      mail (~> 2.4.4)
+    actionpack (3.2.11)
+      activemodel (= 3.2.11)
+      activesupport (= 3.2.11)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      journey (~> 1.0.4)
+      rack (~> 1.4.0)
+      rack-cache (~> 1.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.2.1)
+    activemodel (3.2.11)
+      activesupport (= 3.2.11)
+      builder (~> 3.0.0)
+    activerecord (3.2.11)
+      activemodel (= 3.2.11)
+      activesupport (= 3.2.11)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activeresource (3.2.11)
+      activemodel (= 3.2.11)
+      activesupport (= 3.2.11)
+    activesupport (3.2.11)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    amq-protocol (1.9.2)
+    amqp (1.1.8)
+      amq-protocol (>= 1.9.2)
+      eventmachine
+    arel (3.0.3)
+    awesome_print (1.2.0)
+    builder (3.0.4)
+    coffee-rails (3.2.2)
+      coffee-script (>= 2.2.0)
+      railties (~> 3.2.0)
+    coffee-script (2.2.0)
+      coffee-script-source
+      execjs
+    coffee-script-source (1.7.0)
+    colorize (0.5.8)
+    erubis (2.7.0)
+    eventmachine (1.0.3)
+    execjs (2.0.2)
+    hike (1.2.3)
+    i18n (0.6.9)
+    journey (1.0.4)
+    jquery-rails (3.1.0)
+      railties (>= 3.0, < 5.0)
+      thor (>= 0.14, < 2.0)
+    json (1.8.1)
+    mail (2.4.4)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.25.1)
+    multi_json (1.8.4)
+    open4 (1.3.2)
+    polyglot (0.3.4)
+    rack (1.4.5)
+    rack-cache (1.2)
+      rack (>= 0.4)
+    rack-ssl (1.3.3)
+      rack
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rails (3.2.11)
+      actionmailer (= 3.2.11)
+      actionpack (= 3.2.11)
+      activerecord (= 3.2.11)
+      activeresource (= 3.2.11)
+      activesupport (= 3.2.11)
+      bundler (~> 1.0)
+      railties (= 3.2.11)
+    railties (3.2.11)
+      actionpack (= 3.2.11)
+      activesupport (= 3.2.11)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (>= 0.14.6, < 2.0)
+    rake (10.1.1)
+    rdoc (3.12.2)
+      json (~> 1.4)
+    ruby-progressbar (1.0.2)
+    sass (3.2.14)
+    sass-rails (3.2.6)
+      railties (~> 3.2.0)
+      sass (>= 3.1.10)
+      tilt (~> 1.3)
+    sprockets (2.2.2)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    sqlite3 (1.3.9)
+    thor (0.18.1)
+    tilt (1.4.1)
+    treetop (1.4.15)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.38)
+    uglifier (2.4.0)
+      execjs (>= 0.3.0)
+      json (>= 1.8.0)
+    uuidtools (2.1.3)
+    yajl-ruby (1.1.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  coffee-rails (~> 3.2.1)
+  gorgon!
+  jquery-rails
+  rails (= 3.2.11)
+  sass-rails (~> 3.2.3)
+  sqlite3
+  uglifier (>= 1.0.3)