daemon-kit 0.3.0.rc1 → 0.3.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9356410391db8c1c25d11bed90a08e76fba383a3
-  data.tar.gz: c87d71466d79190914007f2596262df9c8b338fd
+  metadata.gz: 90f5bbda2dfba4dc58989fb7d284ea2b52c6b16b
+  data.tar.gz: 8655f358efe6044f8b916e9979970d7fa21d4844
 SHA512:
-  metadata.gz: 4d58c735226158c03e18e936f1fdb39d8387bf59f464265c0694312825e23b6d0d9ba850fa13102fdb4ebfcc860fec035b338bf3579cb9b79209d41db0221138
-  data.tar.gz: e601935b3e7798ca8dd232ffa31ec15c3aab44aa14024fcca41f6b03f099f2936e898f9858154718bb9cb844aad1d646b514ff568caa4794b97ed97d3715b77e
+  metadata.gz: e9302898942d1dfb22c1c9df876d72803518ad6983dc5da4515ed903ea40667a7f74c93271122e5d8042810d97981088aa61ba2767abc6f56056414c80727c1d
+  data.tar.gz: e2697eb00c2009c32eb7c5690353214f3d81f9dbf7d76968f2b4b05c7b8a5f38966ca90504d428aad12b3324ab6b284375da8e6ee61b01e51e7a5300c83c0926

data/.rspec

@@ -0,0 +1,2 @@
+--colour
+--pattern "spec/*_spec.rb"

data/.travis.yml

@@ -13,3 +13,5 @@ matrix:
     - rvm: 1.8.7
     - rvm: ree
 before_install: umask 0022
+gemfile:
+  - gemfiles/Gemfile.ci

data/README.md

@@ -3,6 +3,7 @@
 [![Code Climate](https://codeclimate.com/github/kennethkalmer/daemon-kit.png)](https://codeclimate.com/github/kennethkalmer/daemon-kit)
 [![Gem Version](https://badge.fury.io/rb/daemon-kit.png)](http://badge.fury.io/rb/daemon-kit)
 [![Build Status](https://travis-ci.org/kennethkalmer/daemon-kit.png)](https://travis-ci.org/kennethkalmer/daemon-kit)
+[![Coverage Status](https://coveralls.io/repos/kennethkalmer/daemon-kit/badge.png)](https://coveralls.io/r/kennethkalmer/daemon-kit)
 
 * https://github.com/kennethkalmer/daemon-kit/wiki
 * http://rdoc.info/github/kennethkalmer/daemon-kit
@@ -81,7 +82,7 @@ The [ruote](http://openwfe.rubyforge.org) remote participant generator speeds up
 
 Depending on the generator you choose for your daemon, it might require additional gems to run.
 
-* xmpp - [blather](http://blather.squishtech.com/)
+* xmpp - [blather](http://blather.squishtech.com/) ~> 0.8.7
 * cron - [rufus-scheduler](http://github.com/jmettraux/rufus-scheduler) (at least version 2.0.0)
 * amqp - [amqp](http://github.com/tmm1/amqp)
 * ruote - none, although [ruote](http://openwfe.rubyforge.org) should probably be running somewhere

data/Upgrading.md

@@ -1,6 +1,17 @@
 Some important upgrading information
 ====================================
 
+Upgrading to 0.3.0
+------------------
+
+From 0.2 there hasn't been any signifant changes. 0.3.0.rc2 made some changes
+to the way a daemon boots, so after updating you'll need to run:
+
+    $ rake daemon_kit:upgrade
+
+We recommend running this task on a clean repo, or branch, so you can review
+the changes using your favourite diff tool.
+
 Upgrading to 0.1.9
 ------------------
 

data/daemon-kit.gemspec

@@ -42,9 +42,9 @@ $ daemon-kit -h
   gem.add_development_dependency(%q<cucumber>, ["~> 1.3.8"])
   gem.add_development_dependency(%q<aruba>, ["~> 0.5.3"])
   gem.add_development_dependency(%q<SyslogLogger>)
+  gem.add_development_dependency(%q<safely>, ["~> 0.3.2"])
 
   gem.add_dependency(%q<thor>)
   gem.add_runtime_dependency(%q<eventmachine>, [">= 0.12.10"])
-  gem.add_runtime_dependency(%q<safely>, [">= 0.3.1"])
   gem.add_runtime_dependency(%q<i18n>)
 end

data/features/app_generator.feature

@@ -44,3 +44,8 @@ Feature: Generating a new daemon
       | tasks |
       | vendor |
       | tmp |
+
+  Scenario: Generating an 'edge' daemon
+    When I run `daemon-kit vuvuzela --edge`
+    And I cd to "vuvuzela"
+    Then the Gemfile should point to edge daemon-kit

data/features/step_definitions/daemon_steps.rb

@@ -8,3 +8,20 @@ When(/^I accept the conflicts$/) do
   type "a\n"
   #eot
 end
+
+Then(/^the Gemfile should point to edge daemon\-kit$/) do
+  prep_for_fs_check do
+    gemfile = IO.read('Gemfile')
+
+    gemfile.should =~ /^gem 'daemon\-kit', :github => 'kennethkalmer\/daemon\-kit'$/
+    gemfile.should_not =~ /^gem 'daemon\-kit'$/
+  end
+end
+
+Given(/^I have a daemon generated by daemon\-kit "(.*?)"$/) do |project|
+  copy_fixture_project( project )
+end
+
+Given(/^I cd to the old project$/) do
+  cd "fixture_project"
+end

data/features/support/env.rb

@@ -1,3 +1,9 @@
+begin
+  require 'coveralls'
+  Coveralls.wear_merged!
+rescue LoadError
+end
+
 require 'rspec'
 
 DAEMON_ENV = "test"
@@ -6,3 +12,7 @@ $:.unshift File.expand_path( '/../lib', __FILE__ )
 require 'daemon_kit'
 
 require 'aruba/cucumber'
+
+Before do
+  @aruba_timeout_seconds = 5
+end

data/features/support/fixtures.rb

@@ -0,0 +1,21 @@
+module ProjectFixtures
+  DAEMON_FIXTURES_PATH = File.expand_path( '../../../spec/fixtures', __FILE__ )
+
+  def copy_fixture_project( name )
+    name = case name
+          when '0.2.3'
+            'zero_two_three'
+          else
+            raise ArgumentError, "Unknown fixture project: #{name}"
+          end
+
+    src = File.join( DAEMON_FIXTURES_PATH, name )
+
+    in_current_dir do
+      FileUtils.cp_r( src, 'fixture_project' )
+    end
+  end
+
+end
+
+World( ProjectFixtures )

data/features/upgrades.feature

@@ -0,0 +1,11 @@
+Feature: Upgrading an older daemon
+
+  daemon-kit offers help during upgrades to newer versions.
+
+  Scenario: Upgrading from 0.2.3
+    Given I have a daemon generated by daemon-kit "0.2.3"
+    And I cd to the old project
+    When I run `rake daemon_kit:upgrade` interactively
+    And I accept the conflicts
+    Then the file "Gemfile" should contain "gem 'daemon-kit', :github => 'kennethkalmer/daemon-kit'"
+    And the file "config/boot.rb" should not contain "VendorBoot"

data/gemfiles/Gemfile.ci

@@ -0,0 +1,8 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in daemon-kit.gemspec
+gemspec path: '../'
+
+group :development do
+  gem 'coveralls', require: false
+end

data/lib/daemon_kit/abstract_logger.rb

@@ -160,7 +160,6 @@ module DaemonKit
     def clean_trace( trace )
       trace = trace.map { |l| l.gsub(DAEMON_ROOT, '') }
       trace = trace.reject { |l| l =~ /gems\/daemon[\-_]kit/ }
-      trace = trace.reject { |l| l =~ /vendor\/daemon[\-_]kit/ }
       trace
     end
 

data/lib/daemon_kit/initializer.rb

@@ -8,8 +8,6 @@ $LOAD_PATH.unshift( File.expand_path('../', __FILE__).to_absolute_path ) unless
   $LOAD_PATH.include?( File.expand_path('../', __FILE__).to_absolute_path )
 
 require 'daemon_kit'
-require 'safely'
-
 module DaemonKit
 
   class << self
@@ -75,13 +73,19 @@ module DaemonKit
         end
       end
 
-      Safely::Backtrace.safe_shutdown! if DaemonKit.configuration.backtraces && clean
+      if safely_available?
+        Safely::Backtrace.safe_shutdown! if DaemonKit.configuration.backtraces && clean
+      end
 
       DaemonKit.logger.warn "Shutting down #{DaemonKit.configuration.daemon_name}"
 
       exit if do_exit
     end
 
+    def self.safely_available?
+      defined? Safely
+    end
+
     def initialize( configuration )
       @configuration = configuration
     end
@@ -104,7 +108,7 @@ module DaemonKit
 
       include_core_lib
       load_postdaemonize_configs
-      configure_safely
+      configure_exception_handling
 
       set_process_name
 
@@ -203,9 +207,14 @@ module DaemonKit
       end
     end
 
-    def configure_safely
+    def configure_exception_handling
       Thread.abort_on_exception = true
 
+      configure_safely if self.class.safely_available?
+    end
+
+    def configure_safely
+      DaemonKit.logger.info "Configuring safely for exception handling"
       Safely::Strategy::Log.logger = DaemonKit.logger
 
       Safely::Backtrace.trace_directory = File.join( DAEMON_ROOT, "log" )
@@ -325,8 +334,9 @@ module DaemonKit
       @shutdown_hooks << ( proc || block )
     end
 
-    def pid_file( instance = nil )
-      @pid_file ||= "#{File.dirname(self.log_path)}/#{self.daemon_name}.#{instance}.pid"
+    def pid_file( instance = instance )
+      @pid_file ||=
+        File.join( File.dirname(self.default_log_path), "#{self.daemon_name}.#{instance}.pid" )
     end
 
     def instance
@@ -346,6 +356,10 @@ module DaemonKit
       self.signal_traps[ signal ].each { |trap| trap.call }
     end
 
+    def default_log_path
+      File.join(root_path, 'log', "#{environment}.log")
+    end
+
     private
 
     def set_trap( signal )
@@ -403,10 +417,6 @@ module DaemonKit
       [ 'lib' ]
     end
 
-    def default_log_path
-      File.join(root_path, 'log', "#{environment}.log")
-    end
-
     def default_log_level
       environment == 'production' ? :info : :debug
     end

data/lib/daemon_kit/ruote_participants.rb

@@ -105,7 +105,8 @@ module DaemonKit
 
           cmdq = mq.queue( q, :durable => true )
           cmdq.subscribe( :ack => true ) do |header, message|
-            safely do
+
+            receiver = lambda do |header, message|
               DaemonKit.logger.debug("Received workitem: #{message.inspect}")
 
               RuoteWorkitem.process( :amqp, @amqp_reply_queue, message )
@@ -114,6 +115,15 @@ module DaemonKit
 
               header.ack
             end
+
+            if DaemonKit::Initializer.safely_available?
+              safely { receiver.call( header, message ) }
+
+            else
+              receiver.call( header, message )
+
+            end
+
           end
         end
       end

data/lib/daemon_kit/tasks/framework.rake

@@ -1,80 +1,9 @@
 namespace :daemon_kit do
-  namespace :freeze do
-    desc "Lock this application to the current gem (by unpacking it into vendor/daemon_kit)"
-    task :gems do
-      deps = %w()
-      require 'rubygems'
-      require 'rubygems/gem_runner'
-
-      kit = (version = ENV['VERSION']) ?
-        Gem.cache.find_name('daemon-kit', "= #{version}").first :
-        Gem.cache.find_name('daemon-kit').sort_by { |g| g.version }.last
-
-      version ||= kit.version
-
-      unless kit
-        puts "No daemon_kit gem #{version} is installed.  Do 'gem list daemon-kit' to see what you have available."
-        exit
-      end
-
-      puts "Freezing the gem for DaemonKit #{kit.version}"
-      mkdir_p "vendor"
-
-      begin
-        chdir("vendor") do
-          kit.dependencies.select { |g| deps.include? g.name }.each do |g|
-            Gem::GemRunner.new.run(["unpack", g.name, "--version", g.version_requirements.to_s])
-            mv(Dir.glob("#{g.name}*").first, g.name)
-          end
-
-          Gem::GemRunner.new.run(["unpack", "daemon-kit", "--version", "=#{version}"])
-          FileUtils.mv(Dir.glob("daemon-kit*").first, "daemon-kit")
-        end
-      rescue Exception
-        rm_rf "vendor/daemon-kit"
-        raise
-      end
-    end
-
-    desc 'Lock to latest edge daemon_kit'
-    task :edge do
-      require 'open-uri'
-      #version = ENV["RELEASE"] || "edge"
-      commits = "http://github.com/api/v1/yaml/kennethkalmer/daemon-kit/commits/master"
-      url     = "http://github.com/kennethkalmer/daemon-kit/zipball/master"
-
-      rm_rf   "vendor/daemon-kit"
-
-      chdir 'vendor' do
-        latest_revision = YAML.load(open(commits))["commits"].first["id"]
-
-        puts "Downloading DaemonKit from #{url}"
-        File.open('daemon-kit.zip', 'wb') do |dst|
-          open url do |src|
-            while chunk = src.read(4096)
-              dst << chunk
-            end
-          end
-        end
-
-        puts 'Unpacking DaemonKit'
-        rm_rf 'daemon-kit'
-        `unzip daemon-kit.zip`
-        FileUtils.mv(Dir.glob("kennethkalmer-daemon-kit*").first, "daemon-kit")
-        %w(daemon-kit.zip).each do |goner|
-          rm_f goner
-        end
-
-        touch "REVISION_#{latest_revision}"
-      end
-    end
-
-  end
 
   desc "Upgrade your local files for a daemon after upgrading daemon-kit"
   task :upgrade => 'environment' do
     # Run these
-    %w{ initializers rakefile scripts gemfile }.each do |t|
+    %w{ config root scripts }.each do |t|
       Rake::Task["daemon_kit:upgrade:#{t}"].invoke
     end
 
@@ -83,41 +12,31 @@ namespace :daemon_kit do
   end
 
   namespace :upgrade do
-    # Upgrade the initializers
-    task :initializers do
-      copy_framework_template( 'config', 'boot.rb' )
+    def invoke_from_app_generator(method)
+      app_generator.send(method)
+    end
 
-      if File.directory?( File.join(DaemonKit.root, 'config', 'initializers') )
-        mv File.join(DaemonKit.root, 'config', 'initializers'), File.join(DAEMON_ROOT, 'config', 'pre-daemonize')
-        copy_framework_template( 'config', 'pre-daemonize', 'readme' )
-      end
+    def app_generator
+      @app_generator ||= begin
+        require 'daemon_kit/generators'
 
-      unless File.directory?( File.join(DAEMON_ROOT, 'config', 'post-daemonize') )
-        mkdir_p File.join(DAEMON_ROOT, 'config', 'post-daemonize')
-        copy_framework_template( 'config', 'post-daemonize', 'readme' )
+        name = DaemonKit.configuration.daemon_name
+        gen = DaemonKit::Generators::AppGenerator.new( [name], { :with_dispatchers => true },
+                                                      :destination_root => DaemonKit.root )
+        gen
       end
     end
 
-    # Upgrade the Rakefile
-    task :rakefile do
-      copy_framework_template( 'Rakefile' )
+    task :config do
+      invoke_from_app_generator(:create_config_files)
     end
 
-    # Upgrade the scripts
-    task :scripts do
-      %w{ console destroy generate }.each do |s|
-        copy_framework_template( "script", s )
-      end
+    task :root do
+      invoke_from_app_generator(:create_root_files)
     end
 
-    # Upgrade the Gemfile
-    task :gemfile do
-      copy_framework_template( 'Gemfile' )
+    task :scripts do
+      invoke_from_app_generator(:create_script_files)
     end
   end
 end
-
-def copy_framework_template( *args )
-  src_dir = File.join(DaemonKit.framework_root, 'lib', 'generators', 'daemon_kit', 'app', 'templates')
-  cp File.join( src_dir, *args ), File.join( DaemonKit.root, *args )
-end

data/lib/daemon_kit/version.rb

@@ -1,6 +1,8 @@
 module DaemonKit
+
   def version
-    '0.3.0.rc1'
+    '0.3.0.rc2'
   end
+
   module_function :version
 end

data/lib/daemon_kit/xmpp.rb

@@ -1,5 +1,6 @@
 require 'blather/client/client'
 require 'blather/client/dsl'
+require 'blather/version'
 
 module DaemonKit
   # Thin wrapper around the blather DSL
@@ -9,6 +10,10 @@ module DaemonKit
     class << self
 
       def run( &block )
+        if Blather::VERSION < '0.8.0'
+          DaemonKit.logger.warn "Blather version to old, please upgrade to 0.8.x"
+        end
+
         DaemonKit.trap('INT') { ::EM.stop }
         DaemonKit.trap('TERM') { ::EM.stop }
 
@@ -53,9 +58,9 @@ module DaemonKit
     def configure_roster!
       DaemonKit.logger.debug 'Configuring roster'
 
-      my_roster.each do |(jid, item)|
-        unless contacts.include?( jid )
-          DaemonKit.logger.debug "Removing #{jid} from roster"
+      my_roster.each do |item|
+        unless valid_contact?( item.jid )
+          DaemonKit.logger.debug "Removing #{item.jid} from roster"
 
           my_roster.delete( item.jid )
           next
@@ -68,7 +73,7 @@ module DaemonKit
         my_roster.add( Blather::JID.new( jid ) )
       end
 
-      my_roster.each do |(jid,item)|
+      my_roster.each do |item|
         item.subscription = :both
         item.ask = :subscribe
       end
@@ -83,7 +88,11 @@ module DaemonKit
     end
 
     def contacts
-      @config.masters + @config.supporters
+      @config.masters | ( @config.supporters || [] )
+    end
+
+    def valid_contact?( jid )
+      contacts.include?( jid.stripped.to_s )
     end
 
     def run