lib/fluq/cli.rb in fluq-0.7.5 vs lib/fluq/cli.rb in fluq-0.8.0

@@ -31,15 +31,10 @@
       unless configured?
         puts parser
         exit
       end
 
-      # Set the environment
-      if options[:env]
-        ENV["FLUQ_ENV"] = options[:env]
-      end
-
       # Boot and add project's lib/ dir to load path
       require 'fluq'
       $LOAD_PATH.unshift FluQ.root.join('lib')
       procline "(starting)"
 
@@ -61,13 +56,13 @@
       SIGNALS.each do |signal|
         trap(signal) {|*| shutdown! }
       end
 
       # Start
-      log "Starting FluQ #{FluQ::VERSION} (#{FluQ.env})"
-      FluQ::Reactor.run do |reactor|
-        FluQ::DSL.new(reactor, options[:config]).run
+      log "Starting FluQ #{FluQ::VERSION} (#{options[:config]})"
+      FluQ::Runner.run do |runner|
+        FluQ::DSL::Root.new(options[:config]).apply(runner)
         procline
       end
     end
 
     # @return [Boolean] true if configured
@@ -103,13 +98,9 @@
             @options[:config] = val
           end
 
           o.separator ""
           o.separator "Optional:"
-
-          o.on("-e", "--environment ENV", "Runtime environment (default: development)") do |val|
-            @options[:env] = val
-          end
 
           o.on("-l", "--log FILE", "File to log to (default: STDOUT)") do |val|
             @options[:log] = val
           end