nezu 0.5.24 → 0.5.25

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    nezu (0.5.24)
+    nezu (0.5.25)
       activerecord (~> 3.2.11)
       activesupport (~> 3.2.11)
       amqp

data/VERSION

@@ -1 +1 @@
-0.5.24
+0.5.25

data/bin/nezu

@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
-puts File.join(File.expand_path('../..', __FILE__), 'lib')
 $:.unshift(File.join(File.expand_path('../..', __FILE__), 'lib'))
 ARGV << 'help' if ARGV.length == 0
 

data/lib/nezu/cli.rb

@@ -1,35 +1,21 @@
+require 'optparse'
 require 'nezu'
 module Nezu
   module CLI
-    def self.help(*params)
-      script_name = File.basename(__FILE__)
-      puts %Q(
-        Usage:
-
-        "#{script_name} new <appname>" for an app skeleton dir in <appname>
-        "#{script_name} run" inside an app dir to start it
-        "#{script_name} console" inside an app dir to get an irb shell with your current env loaded
-
-      ).gsub(/^\s*/, '')
-      exit(1)
-    end
-
-    def self.new(*params)
-      amqp_scope = params[0].grep(/--amqp_scope/)[0].match(/=(\S*)/)[1] rescue nil
-      configatron.amqp_scope = amqp_scope if amqp_scope
-      puts %Q(Creating application dir in "#{params[0][0]}")
+    def self.new(params={})
+      puts %Q(Creating application dir in "#{params[:app]}")
       require 'nezu/generators'
-      app = Nezu::Generators::Application::AppGenerator.new(params[0][0])
+      app = Nezu::Generators::Application::AppGenerator.new(params[:app])
       app.generate!
       puts %Q(Successfully created App.)
       exit(0)
     end
 
-    def self.run(*params)
+    def self.run(params={})
       puts %Q(Starting app...)
       require 'nezu/runner'
       Nezu::Runtime.load_config
-      if params[0].include?('--daemon')
+      if params[:daemon]
         fork do
           $stdout=File.open(Nezu.root.join('log', 'nezu.stdout'), File::CREAT|File::WRONLY)
           $stderr=File.open(Nezu.root.join('log', 'nezu.stderr'), File::CREAT|File::WRONLY)
@@ -41,14 +27,49 @@ module Nezu
       exit(0)
     end
 
-    def self.console(*params)
+    def self.console(params={})
       puts %Q(Starting console...)
-      ARGV.clear
       Nezu::Runtime.load_config
       IRB.start()
     end
   end
 end
 
-Nezu::CLI.send(ARGV.shift, ARGV)
+begin
+  command = ARGV.shift
+  options = {}
+
+  if command == 'new'
+    options[:app] = ARGV.shift
+  else
+
+    optparse = OptionParser.new do|opts|
+      opts.program_name = "#{File.basename($0, '.*')} COMMAND:=run|console|new"
+
+      opts.on( '-h', '--help', 'Display this screen' ) do
+        puts opts
+        exit
+      end
+      if command == 'run'
+        options[:daemon] = false
+        opts.on( '-d', '--daemon', 'Run as a background process' ) do
+          options[:daemon] = true
+        end
+
+      end
+
+      opts.on( '-E <ENV>', '--env <ENV>', 'Start the app with the given environment' ) do |env|
+        options[:env] = env
+        Nezu.env = Nezu::Env.new(env)
+      end
+    end
 
+    optparse.parse!
+  end
+
+  require 'debugger' if Nezu.env.development? || Nezu.env.test?
+
+  Nezu::CLI.send(command, options)
+rescue OptionParser::MissingArgument, OptionParser::InvalidOption
+  puts optparse
+end

data/lib/nezu.rb

@@ -9,7 +9,7 @@ require 'term/ansicolor'
 require 'nezu/runtime'
 
 module Nezu
-  mattr_accessor :logger
+  mattr_accessor :logger, :app, :env, :root, :gem_path
 
   #used by Nezu.env and Nezu.env.developent? etc.
   class Env < String
@@ -43,6 +43,19 @@ module Nezu
     end
   end
 
+  # Returns a String like object with the current name of the environment that responds to thinks like "#development?"
+  self.env = Env.new(ENV['NEZU_ENV']||'development')
+
+  # Returns the app as a class
+  self.app = configatron.app_name.classify
+
+  # Returns a String like object with the applications absolute root
+  self.root = Root::APP_PATH
+
+  # Returns a String like object with the gems absolute root
+  self.gem_path = Root::GEM_PATH
+
+
   # all these nice colorful log entries are created here
   # if you don`t like them just override its #call method
   class CustomLogFormatter
@@ -91,25 +104,6 @@ module Nezu
     end
   end
 
-  # Returns a String like object with the current name of the environment
-  def self.env
-    Env.new(ENV['NEZU_ENV']||'development')
-  end
-
-  def self.app
-    configatron.app_name.classify
-  end
-
-  # Returns a String like object with the applications absolute root
-  def self.root
-    Root::APP_PATH
-  end
-
-  # Returns a String like object with the gems absolute root
-  def self.gem_path
-    Root::GEM_PATH
-  end
-
   # turn errors into warnings if used in verbose mode (Nezu.try(true) { ... })
   # useful if you find it acceptable that something isn't
   # working
@@ -137,5 +131,3 @@ module Nezu
   end
 end
 
-require 'debugger' if Nezu.env.development? || Nezu.env.test?
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nezu
 version: !ruby/object:Gem::Version
-  version: 0.5.24
+  version: 0.5.25
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-24 00:00:00.000000000 Z
+date: 2013-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amqp