daemon-kit 0.2.3 → 0.3.0.rc1

data/features/support/env.rb

@@ -0,0 +1,8 @@
+require 'rspec'
+
+DAEMON_ENV = "test"
+
+$:.unshift File.expand_path( '/../lib', __FILE__ )
+require 'daemon_kit'
+
+require 'aruba/cucumber'

data/features/test_unit_generator.feature

@@ -0,0 +1,18 @@
+Feature: Test/Unit generator
+
+  Scenario: Using test/unit generator when generating a new daemon
+    When I run `daemon-kit vuvuzela -t test_unit`
+    And I cd to "vuvuzela"
+    Then the following files should exist:
+      | test/test_helper.rb |
+      | test/vuvuzela_test.rb |
+      | tasks/test_unit.rake |
+
+  Scenario: Using AMQP generator on an existing daemon
+    Given I have an existing daemon called "vuvuzela"
+    And I cd to "vuvuzela"
+    When I run `./script/generate test_unit`
+    Then the following files should exist:
+      | test/test_helper.rb |
+      | test/vuvuzela_test.rb |
+      | tasks/test_unit.rake |

data/lib/daemon_kit.rb

@@ -30,7 +30,6 @@ module DaemonKit
   autoload :Jabber,                 'daemon_kit/jabber'
   autoload :AMQP,                   'daemon_kit/dk_amqp'
   autoload :SQS,                    'daemon_kit/dk_sqs'
-  autoload :Nanite,                 'daemon_kit/nanite'
   autoload :RuoteParticipants,      'daemon_kit/ruote_participants'
   autoload :RuoteWorkitem,          'daemon_kit/ruote_workitem'
   autoload :RuotePseudoParticipant, 'daemon_kit/ruote_pseudo_participant'

data/lib/daemon_kit/generators.rb

@@ -8,7 +8,6 @@ module DaemonKit
     autoload :SqsGenerator,         'generators/daemon_kit/sqs/sqs_generator'
     autoload :CronGenerator,        'generators/daemon_kit/cron/cron_generator'
     autoload :CapistranoGenerator,  'generators/daemon_kit/capistrano/capistrano_generator'
-    autoload :NaniteAgentGenerator, 'generators/daemon_kit/nanite_agent/nanite_agent_generator'
     autoload :SpecGenerator,        'generators/daemon_kit/rspec/rspec_generator'
     autoload :TestUnitGenerator,    'generators/daemon_kit/test_unit/test_unit_generator'
     autoload :RuoteGenerator,       'generators/daemon_kit/ruote/ruote_generator'

data/lib/daemon_kit/version.rb

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

data/lib/generators/daemon_kit/amqp/amqp_generator.rb

@@ -3,7 +3,7 @@ module DaemonKit
     class AmqpGenerator < Base
 
       def update_gemfile
-        append_file 'Gemfile', "gem 'amqp'\n"
+        append_file 'Gemfile', "\ngem 'amqp'\n"
       end
 
       def create_config_files

data/lib/generators/daemon_kit/app/app_generator.rb

@@ -1,7 +1,7 @@
 module DaemonKit
   module Generators
     class AppGenerator < Base
-      INSTALLERS = %w( default amqp sqs cron nanite_agent ruote xmpp )
+      INSTALLERS = %w( default amqp sqs cron ruote xmpp )
       DEPLOYERS  = %w( capistrano )
       TEST_FRAMEWORKS = %w( none rspec test_unit )
       add_shebang_option!
@@ -97,8 +97,6 @@ module DaemonKit
           invoke DaemonKit::Generators::SqsGenerator
         when 'cron'
           invoke DaemonKit::Generators::CronGenerator
-        when 'nanite_agent'
-          invoke DaemonKit::Generators::NaniteAgentGenerator
         when 'ruote'
           invoke DaemonKit::Generators::RuoteGenerator
         when 'xmpp'

data/lib/generators/daemon_kit/app/templates/script/destroy

@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
 require File.expand_path( '../../config/environment', __FILE__ )
-require 'daemon_kit/commands/generate'
+require 'daemon_kit/commands/destroy'

data/lib/generators/daemon_kit/capistrano/capistrano_generator.rb

@@ -3,7 +3,7 @@ module DaemonKit
     class CapistranoGenerator < Base
 
       def update_gemfile
-        append_file 'Gemfile', "gem 'capistrano'\n"
+        append_file 'Gemfile', "\ngem 'capistrano'\n"
         append_file 'Gemfile', "gem 'capistrano-ext'\n"
       end
 

data/lib/generators/daemon_kit/cron/cron_generator.rb

@@ -3,7 +3,7 @@ module DaemonKit
     class CronGenerator < Base
 
       def update_gemfile
-        append_file 'Gemfile', "gem 'rufus-scheduler', '>= 2.0.3'\n"
+        append_file 'Gemfile', "\ngem 'rufus-scheduler', '>= 2.0.3'\n"
       end
 
       def create_initializers

data/lib/generators/daemon_kit/rspec/templates/spec/%app_name%_spec.rb

@@ -3,9 +3,9 @@ require File.dirname(__FILE__) + '/spec_helper.rb'
 # Time to add your specs!
 # http://rspec.info/
 describe "Place your specs here" do
-  
+
   it "find this spec in spec directory" do
-    violated "Be sure to write your specs"
+    pending "Be sure to write your specs"
   end
-  
+
 end

data/lib/generators/daemon_kit/ruote/ruote_generator.rb

@@ -3,8 +3,10 @@ module DaemonKit
     class RuoteGenerator < Base
 
       def update_gemfile
-        append_file 'Gemfile', "gem 'amqp' # Only needed if running the AMQP participant/listener pair\n"
-        append_file 'Gemfile', "gem 'json' # Can be replaced with json_pure\n"
+        append_file 'Gemfile', "\n# Only needed if running the AMQP participant/listener pair\n"
+        append_file 'Gemfile', "gem 'amqp'\n"
+        append_file 'Gemfile', "# Can be replaced with json_pure\n"
+        append_file 'Gemfile', "gem 'json'\n"
       end
 
       def create_configs

data/lib/generators/daemon_kit/sqs/sqs_generator.rb

@@ -3,7 +3,7 @@ module DaemonKit
     class SqsGenerator < Base
 
       def update_gemfile
-        append_file 'Gemfile', "gem 'aws-sdk'\n"
+        append_file 'Gemfile', "\ngem 'aws-sdk'\n"
       end
 
       def create_config_files

data/spec/abstract_logger_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 
 describe DaemonKit::AbstractLogger do
 
@@ -25,7 +25,7 @@ describe DaemonKit::AbstractLogger do
   it "should be able to log to STDOUT as well" do
     @logger.copy_to_stdout = true
 
-    STDOUT.expects(:puts).with(regexp_matches(/test/))
+    STDOUT.should_receive(:puts).with(/test/)
 
     @logger.debug "test"
     IO.readlines( @log_file ).last.should match(/test/)
@@ -67,7 +67,7 @@ describe DaemonKit::AbstractLogger do
     IO.readlines( @log_file ).last.should match(/\[ANY\].*Unknown test/)
   end
 
-  it "should log the caller file and line number" do
+  pending "should log the caller file and line number" do
     f = File.basename(__FILE__)
     l = __LINE__ + 2
 

data/spec/spec_helper.rb

@@ -1,26 +1,34 @@
-require 'rubygems'
-require 'rspec'
-
-require 'mocha'
 require 'fileutils'
+require 'stringio'
+
+require 'rspec'
 
 DAEMON_ENV  = "test"
-DAEMON_ROOT = "#{File.dirname(__FILE__)}/../tmp"
+DAEMON_ROOT = File.expand_path('../../tmp/daemon', __FILE__)
 
 $:.unshift( File.dirname(__FILE__) + '/../lib' )
 require 'daemon_kit'
 
+# Requires supporting ruby files with custom matchers and macros, etc,
+# in spec/support/ and its subdirectories.
+Dir[ File.expand_path("../support/**/*.rb", __FILE__) ].each { |f| require f }
+
 RSpec.configure do |config|
   # == Mock Framework
   #
   # RSpec uses it's own mocking framework by default. If you prefer to
   # use mocha, flexmock or RR, uncomment the appropriate line:
   #
-  config.mock_with :mocha
+  # config.mock_with :mocha
   # config.mock_with :flexmock
   # config.mock_with :rr
 
-  # setup a fake daemon_root
-  config.before(:all) { File.directory?( DAEMON_ROOT ) ? FileUtils.rm_rf("#{DAEMON_ROOT}/*") : FileUtils.mkdir_p( DAEMON_ROOT ) }
-  config.after(:all) { FileUtils.rm_rf("#{DAEMON_ROOT}/*") }
+  config.before(:all) do
+    FileUtils.rm_rf("#{DAEMON_ROOT}/*")
+    FileUtils.mkdir_p( DAEMON_ROOT )
+  end
+
+  config.after(:all) do
+    FileUtils.rm_rf("#{DAEMON_ROOT}/*")
+  end
 end

data/tasks/cucumber.rake

@@ -1,13 +1,6 @@
-begin
-  require 'cucumber/rake/task'
+require 'cucumber/rake/task'
 
-  Cucumber::Rake::Task.new(:features) do |t|
-    t.fork = true
-    t.cucumber_opts = ['--format', (ENV['CUCUMBER_FORMAT'] || 'pretty')]
-  end
-rescue LoadError
-  desc 'Cucumber rake task not available'
-  task :features do
-    abort 'Cucumber rake task is not available. Be sure to install cucumber as a gem or plugin'
-  end
+Cucumber::Rake::Task.new(:features) do |t|
+  t.fork = true
+  t.cucumber_opts = ['--format', (ENV['CUCUMBER_FORMAT'] || 'pretty')]
 end

metadata

@@ -1,69 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: daemon-kit
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0.rc1
 platform: ruby
 authors:
 - Kenneth Kalmer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-28 00:00:00.000000000 Z
+date: 2013-09-11 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: thor
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -86,96 +72,96 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 1.3.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 1.3.8
 - !ruby/object:Gem::Dependency
-  name: mocha
+  name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.12
+        version: 0.5.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.12
+        version: 0.5.3
 - !ruby/object:Gem::Dependency
   name: SyslogLogger
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: eventmachine
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.12.10
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.12.10
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: safely
+  name: eventmachine
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.12.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.12.10
 - !ruby/object:Gem::Dependency
-  name: rubigen
+  name: safely
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.1
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: daemon-kit aims to simplify creating Ruby daemons by providing a sound
@@ -191,18 +177,19 @@ extra_rdoc_files:
 - Deployment.txt
 - History.txt
 - Logging.txt
-- README.rdoc
+- README.md
 - RuoteParticipants.txt
 - TODO.txt
 files:
 - .gitignore
+- .travis.yml
 - Configuration.txt
 - Deployment.txt
 - Gemfile
 - Gemfile.lock
 - History.txt
 - Logging.txt
-- README.rdoc
+- README.md
 - Rakefile
 - RuoteParticipants.txt
 - TODO.txt
@@ -210,6 +197,15 @@ files:
 - bin/daemon-kit
 - config/website.yml
 - daemon-kit.gemspec
+- features/amqp_generator.feature
+- features/app_generator.feature
+- features/capistrano_generator.feature
+- features/cron_generator.feature
+- features/ruote_generator.feature
+- features/sqs_generator.feature
+- features/step_definitions/daemon_steps.rb
+- features/support/env.rb
+- features/test_unit_generator.feature
 - lib/daemon_kit.rb
 - lib/daemon_kit/abstract_logger.rb
 - lib/daemon_kit/application.rb
@@ -233,8 +229,6 @@ files:
 - lib/daemon_kit/generators/base.rb
 - lib/daemon_kit/initializer.rb
 - lib/daemon_kit/jabber.rb
-- lib/daemon_kit/nanite.rb
-- lib/daemon_kit/nanite/agent.rb
 - lib/daemon_kit/pid_file.rb
 - lib/daemon_kit/ruote_participants.rb
 - lib/daemon_kit/ruote_pseudo_participant.rb
@@ -291,12 +285,6 @@ files:
 - lib/generators/daemon_kit/cucumber/templates/features/support/env.rb
 - lib/generators/daemon_kit/cucumber/templates/script/cucumber
 - lib/generators/daemon_kit/cucumber/templates/tasks/cucumber.rake
-- lib/generators/daemon_kit/nanite_agent/USAGE
-- lib/generators/daemon_kit/nanite_agent/nanite_agent_generator.rb
-- lib/generators/daemon_kit/nanite_agent/templates/config/nanite.yml
-- lib/generators/daemon_kit/nanite_agent/templates/config/pre-daemonize/nanite_agent.rb
-- lib/generators/daemon_kit/nanite_agent/templates/lib/actors/sample.rb
-- lib/generators/daemon_kit/nanite_agent/templates/libexec/%app_name%-daemon.rb
 - lib/generators/daemon_kit/rspec/USAGE
 - lib/generators/daemon_kit/rspec/rspec_generator.rb
 - lib/generators/daemon_kit/rspec/templates/spec/%app_name%_spec.rb
@@ -325,10 +313,6 @@ files:
 - lib/generators/daemon_kit/xmpp/templates/config/xmpp.yml
 - lib/generators/daemon_kit/xmpp/templates/libexec/%app_name%-daemon.rb
 - lib/generators/daemon_kit/xmpp/xmpp_generator.rb
-- script/console
-- script/destroy
-- script/generate
-- script/txt2html
 - spec/abstract_logger_spec.rb
 - spec/argument_spec.rb
 - spec/config_spec.rb
@@ -341,54 +325,57 @@ files:
 - spec/spec_helper.rb
 - tasks/cucumber.rake
 - tasks/rspec.rake
-- tasks/tests.rake
 - templates/god/god.erb
 - templates/monit/monit.erb
-- test/test_amqp_generator.rb
-- test/test_cron_generator.rb
-- test/test_daemon-kit_generator.rb
-- test/test_daemon_kit_config.rb
-- test/test_deploy_capistrano_generator.rb
-- test/test_generator_helper.rb
-- test/test_helper.rb
-- test/test_nanite_agent_generator.rb
-- test/test_ruote_generator.rb
-- test/test_sqs_generator.rb
-- test/test_test_unit_generator.rb
 homepage: http://github.com/kennethkalmer/daemon-kit
 licenses:
 - MIT
 metadata: {}
-post_install_message: ! '
+post_install_message: |2+
 
   For more information on daemon-kit, see http://kit.rubyforge.org/daemon-kit
 
-
   For usage options, run:
 
-
   $ daemon-kit -h
 
 
-
-'
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Opinionated framework for Ruby daemons
-test_files: []
+test_files:
+- features/amqp_generator.feature
+- features/app_generator.feature
+- features/capistrano_generator.feature
+- features/cron_generator.feature
+- features/ruote_generator.feature
+- features/sqs_generator.feature
+- features/step_definitions/daemon_steps.rb
+- features/support/env.rb
+- features/test_unit_generator.feature
+- spec/abstract_logger_spec.rb
+- spec/argument_spec.rb
+- spec/config_spec.rb
+- spec/configurable_spec.rb
+- spec/daemon_kit_spec.rb
+- spec/fixtures/env.yml
+- spec/fixtures/noenv.yml
+- spec/initializer_spec.rb
+- spec/spec.opts
+- spec/spec_helper.rb