arsenicum 0.1.3 → 0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d49ec4dfbcc45d77e58afdf36d28bee1d06eb68
-  data.tar.gz: 291a2344942b30df1fcc03d274cbb49e76a48560
+  metadata.gz: 0db275857e4df7d382e9118bf5939c1d0f414eac
+  data.tar.gz: e96f9f008045765ec16630f2f0820d2219144de1
 SHA512:
-  metadata.gz: 7f29b77fae0f8c344c64916a44d27d0e02f94a818723d09efda39a8069894344389a9b27b71dd21ff38fc36c093999c6a8fb9b89bee9f82f1d5b25b72e2e5726
-  data.tar.gz: 3193c124fb5c4c090252a233ea8f7428731155d682f1baa7828ce57ae813c92dbf1bf865dec4aca1e23921134df1dbe07c817242e61ba577a41ed07ff3b7fbdc
+  metadata.gz: 8139cf79ce9249b4096db334bd7363c54218339bff1f0a31b6cbc8ce22476462257b45b820a7bb98ff045070d52696a2b1b7f5c5bfa85d9361985c9b51f0a344
+  data.tar.gz: babcd0a21ffd39a7cb3543d63fdb1c4a8bb44f3eb98b323f0ab7be563853e5a59606266ec427946e4294521929078b5ffa0ee0dc88ec09bcdd344b42f31bdd47

data/bin/arsenicum

@@ -1,7 +1,5 @@
 #!/usr/bin/env ruby
 
 require 'arsenicum'
-require 'optparse'
-require 'yaml'
 
 Arsenicum::CLI.new(ARGV).boot

data/bin/arsenicum_rails

@@ -2,4 +2,4 @@
 
 require 'arsenicum'
 
-Arsenicum::CLI::Rails.new(ARGV).boot
+Arsenicum::CLI::RailsCLI.new(ARGV).boot

data/lib/arsenicum/cli/rails_cli.rb

@@ -0,0 +1,20 @@
+require 'optparse'
+
+class Arsenicum::CLI::RailsCLI < Arsenicum::CLI
+  private
+  def create_configuration
+    ::Arsenicum::Configuration::RailsConfiguration.new
+  end
+
+  def create_main
+    ::Arsenicum::Main::RailsMain.new
+  end
+
+  def handle_options(opt)
+    super
+
+    opt.on('-e', '--environment=ENVIRONMENT') do |env|
+      configuration.environment env
+    end
+  end
+end

data/lib/arsenicum/cli.rb

@@ -0,0 +1,50 @@
+class Arsenicum::CLI
+  autoload  :RailsCLI, 'arsenicum/cli/rails_cli'
+
+  attr_reader :arguments, :configuration
+  private     :arguments, :configuration
+
+  def initialize(arguments)
+    @arguments = arguments
+    @configuration = create_configuration
+    parse_options arguments
+  end
+
+  def boot
+    create_main.run configuration
+  end
+
+  private
+  def create_configuration
+    Arsenicum::Configuration.new
+  end
+
+  def create_main
+    Arsenicum::Main.new
+  end
+
+  def parse_options(arguments)
+    OptionParser.new(&method(:handle_options)).parse!(arguments)
+  end
+
+  def handle_options(opt)
+    opt.on '-c', '--config-file=CONFIG_FILE', 'Specifies configuration file. all other options will be ignored.' do |config_path|
+      config_file = File.expand_path config_path
+      script = File.read config_file
+      configuration.instance_eval script, config_file, 1
+    end
+
+    opt.on '-d', '--daemonize' do
+      configuration.daemonize
+    end
+
+    opt.on '--stdout=PATH' do |v|
+      configuration.stdout    v
+    end
+
+    opt.on '--stderr=PATH' do |v|
+      configuration.stderr    v
+    end
+  end
+
+end

data/lib/arsenicum/configuration/rails_configuration.rb

@@ -0,0 +1,12 @@
+class Arsenicum::Configuration::RailsConfiguration < Arsenicum::Configuration
+  attr_reader :rails_env
+
+  def initialize(*)
+    super
+    @rails_env  = 'development'
+  end
+
+  def environment(env_name)
+    @rails_env = env_name
+  end
+end

data/lib/arsenicum/configuration.rb

@@ -4,11 +4,12 @@ module Arsenicum
   class MisconfigurationError < StandardError;end
 
   class Configuration
-    attr_reader :pidfile_path, :daemon, :stdout_path, :stderr_path, :logger_config
+    attr_reader :pidfile_path, :daemon, :stdout_path, :stderr_path, :logger_config, :working_directory
 
     def initialize
       @pidfile_path   = 'arsenicum.pid'
       @logger_config  = LoggerConfiguration.new
+      @working_directory    = '.'
     end
 
     def queue_configurations
@@ -41,6 +42,10 @@ module Arsenicum
       @pidfile_path = path
     end
 
+    def directory(path)
+      @working_directory = path
+    end
+
     class InstanceConfiguration
       include Arsenicum::Util
 
@@ -197,5 +202,7 @@ module Arsenicum
         end
       end
     end
+
+    autoload  :RailsConfiguration, 'arsenicum/configuration/rails_configuration'
   end
 end

data/lib/arsenicum/main/rails_main.rb

@@ -0,0 +1,8 @@
+class Arsenicum::Main::RailsMain < Arsenicum::Main
+  def before_boot(config)
+    env = config.rails_env || 'development'
+    ENV['RAILS_ENV'] = env
+
+    require './config/environment'
+  end
+end

data/lib/arsenicum/main.rb

@@ -1,14 +1,8 @@
 module Arsenicum
-  module Main
-    def run(config_file)
+  class Main
+    def run(config)
       $0 = 'arsenicum[main]'
 
-      config = Arsenicum::Configuration.new
-      config_file = File.expand_path config_file
-
-      script = File.read config_file
-      config.instance_eval script, config_file, 1
-
       if config.daemon
         Process.daemon  true, true
 
@@ -17,9 +11,13 @@ module Arsenicum
         end
       end
 
+      Dir.chdir     config.working_directory
+
       configure_io  config
       configure_log config
 
+      before_boot(config)
+
       threads = config.queue_configurations.map{|qc|qc.build.start_async}
       begin
         threads.each(&:join)
@@ -40,10 +38,12 @@ module Arsenicum
       end
     end
 
+    def before_boot(config);end
+
     def configure_log(config)
       Arsenicum::Logger.configure config.logger_config
     end
 
-    module_function :run, :configure_io,  :configure_log
+    autoload  :RailsMain, 'arsenicum/main/rails_main'
   end
 end

data/lib/arsenicum/version.rb

@@ -1,3 +1,3 @@
 module Arsenicum
-  VERSION = '0.1.3'
+  VERSION = '0.2'
 end

data/lib/arsenicum.rb

@@ -12,16 +12,5 @@ module Arsenicum
   autoload  :Task,                  'arsenicum/task'
   autoload  :Routing,               'arsenicum/routing'
   autoload  :Logger,                'arsenicum/logger'
-
-  class << self
-    def configure(arg = nil, &block)
-      Arsenicum::Configuration.configure arg, &block
-    end
-
-    def configuration
-      Configuration.instance
-    end
-
-    alias_method :config, :configuration
-  end
+  autoload  :CLI,                   'arsenicum/cli'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arsenicum
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: '0.2'
 platform: ruby
 authors:
 - condor
@@ -141,7 +141,10 @@ files:
 - bin/arsenicum_rails
 - lib/arsenicum-rails.rb
 - lib/arsenicum.rb
+- lib/arsenicum/cli.rb
+- lib/arsenicum/cli/rails_cli.rb
 - lib/arsenicum/configuration.rb
+- lib/arsenicum/configuration/rails_configuration.rb
 - lib/arsenicum/core.rb
 - lib/arsenicum/core/broker.rb
 - lib/arsenicum/core/commands.rb
@@ -151,6 +154,7 @@ files:
 - lib/arsenicum/io.rb
 - lib/arsenicum/logger.rb
 - lib/arsenicum/main.rb
+- lib/arsenicum/main/rails_main.rb
 - lib/arsenicum/queue.rb
 - lib/arsenicum/queue/sqs.rb
 - lib/arsenicum/routing.rb