moses 0.1.8 → 0.1.9

data/VERSION

@@ -1 +1 @@
-0.1.8
+0.1.9

data/lib/moses/application.rb

@@ -59,10 +59,9 @@ class Moses::Application
       FileUtils.touch("#{@root_path}/#{@app_name}/bin/#{@app_name}")
       FileUtils.chmod("u+x", "#{@root_path}/#{@app_name}/bin/#{@app_name}")
       File.open("#{@root_path}/#{@app_name}/bin/#{@app_name}", 'w+') do |f|
-        f << %Q{
-#!/usr/bin/env ruby
+        f << %Q{#!/usr/bin/env ruby
 $: << File.expand_path(File.join(File.dirname(__FILE__), "../lib"))
-require '#{@app_name}'
+require "#{@app_name}"
 #{@app_name.camelize}.new.run
         }
       end
@@ -77,7 +76,8 @@ require '#{@app_name}'
     unless File.file?("#{@root_path}/#{@app_name}/lib/#{@app_name}.rb")
       FileUtils.touch("#{@root_path}/#{@app_name}/lib/#{@app_name}.rb")
       File.open("#{@root_path}/#{@app_name}/lib/#{@app_name}.rb", 'w+') do |f|
-        f << %Q{
+        f << %Q{require "moses"
+
 class #{@app_name.camelize}
   include Moses
 end

data/lib/moses.rb

@@ -69,7 +69,7 @@ module Moses
   def parse_options
     @args.each_with_index do |arg, index|
       if flag?(arg)
-        #TODO split compound single dash flags
+        #TODO split compound single dash flags -abc
         next_index = index + 1
         if variable_option? index
           create_variable_option(arg, next_index)
@@ -82,7 +82,7 @@ module Moses
   end
 
   def parse_command
-    unless default_command
+    unless default_command && @args.first == default_command
       @command = @args.shift.to_sym if @args.first && @args.first.respond_to?(:to_sym)
     end
   end

data/moses.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "moses"
-  s.version = "0.1.8"
+  s.version = "0.1.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dayton Nolan"]
-  s.date = "2013-05-21"
+  s.date = "2013-10-17"
   s.description = "Moses is a simple command parser for writing command line applications"
   s.email = "daytonn@gmail.com"
   s.executables = ["moses"]
@@ -35,8 +35,7 @@ Gem::Specification.new do |s|
     "moses.png",
     "spec/application_spec.rb",
     "spec/moses_spec.rb",
-    "spec/spec_helper.rb",
-    "test.rb"
+    "spec/spec_helper.rb"
   ]
   s.homepage = "http://github.com/daytonn/moses"
   s.licenses = ["Apache 2.0"]

data/spec/application_spec.rb

@@ -54,10 +54,9 @@ describe Moses::Application do
       it "makes an executable file" do
         expect(File.file?("#{@tmp_dir}/test_app/bin/test_app")).to be_true
         expect(File.executable?("#{@tmp_dir}/test_app/bin/test_app")).to be_true
-        expected_content = %Q{
-#!/usr/bin/env ruby
+        expected_content = %Q{#!/usr/bin/env ruby
 $: << File.expand_path(File.join(File.dirname(__FILE__), "../lib"))
-require 'test_app'
+require "test_app"
 TestApp.new.run
         }
         expect(File.read("#{@tmp_dir}/test_app/bin/test_app")).to eq(expected_content)
@@ -69,7 +68,8 @@ TestApp.new.run
 
       it "makes an applcation class file" do
         expect(File.file?("#{@tmp_dir}/test_app/lib/test_app.rb")).to be_true
-        expected_content = %Q{
+        expected_content = %Q{require "moses"
+
 class TestApp
   include Moses
 end

data/spec/moses_spec.rb

@@ -94,7 +94,7 @@ describe Moses do
 
     describe "version_file_content" do
       it "returns the contents of the VERSION file" do
-        module Moses VERSION_FILE = 'VERSION.test'; end
+        stub_const("Moses::VERSION_FILE", "VERSION.test")
         File.open('VERSION.test', 'w+') do |f|
           f << 'x.x.x'
         end
@@ -103,13 +103,13 @@ describe Moses do
     end
 
     it "outputs an instruction message when no VERSION file is present" do
-      module Moses VERSION_FILE = 'VERSION.test'; end
+      stub_const("Moses::VERSION_FILE", "VERSION.test")
       @output.should_receive(:puts).with("Include a VERSION file in your project or define a version method")
       @app.send(:version)
     end
 
     it "returns the contents of the VERSION file" do
-      module Moses VERSION_FILE = 'VERSION.test'; end
+      stub_const("Moses::VERSION_FILE", "VERSION.test")
       File.open("VERSION.test", "w+") do |f|
         f << 'x.x.x'
       end
@@ -134,12 +134,6 @@ describe Moses do
       expect(@dc_app.default_command).to eq(:some_command)
     end
 
-    it "doesn't overwrite the default command when passed arguments" do
-      ARGV = ['test']
-      @dc_app.run
-      expect(@dc_app.command).to be_nil
-      expect(@dc_app.args.first).to eq('test')
-    end
   end
 
   describe 'option commands' do
@@ -176,7 +170,7 @@ describe Moses do
     end
 
     it "sets the command to the default option command if the default option is set" do
-      ARGV = ['-h']
+      stub_const("ARGV", ['-h'])
       @app.run
       expect(@app.command).to eq(:help)
     end
@@ -188,7 +182,7 @@ describe Moses do
         option_commands({ foo: :foo, v: :verbose })
       end
       @opt_cmd = OptionCommandsClass.new
-      ARGV = ['-v']
+      stub_const("ARGV", ['-v'])
       @opt_cmd.run
       expect(@opt_cmd.command).to eq(:verbose)
     end
@@ -203,7 +197,7 @@ describe Moses do
 
   describe "run" do
     it "creates a local array of the ARGV array" do
-      ARGV = ['one', 'two', 'three']
+      stub_const("ARGV", ['one', 'two', 'three'])
       @app.stub(:parse_command)
       @app.run
       expect(@app.args).to eq(['one', 'two', 'three'])
@@ -211,7 +205,7 @@ describe Moses do
 
     describe "command parsing" do
       before do
-        ARGV = ['foo']
+        stub_const("ARGV", ['foo'])
         @app.run
       end
 
@@ -227,7 +221,7 @@ describe Moses do
     describe "option parsing" do
       describe "single dash flag" do
         it "creates a boolean option with single dash flags -f" do
-          ARGV = ['foo', '-f']
+          stub_const("ARGV", ['foo', '-f'])
           @app.run
           expect(@app.options[:f]).to be_true
         end
@@ -236,14 +230,14 @@ describe Moses do
       describe 'double dash flag' do
 
         it "removes the flags from the args array" do
-          ARGV = ['foo', '--flag', '-f']
+          stub_const("ARGV", ['foo', '--flag', '-f'])
           @app.run
           expect(@app.args).to eq([])
         end
 
         context 'with value' do
           it "creates a variable option" do
-            ARGV = ['foo', '--flag', 'value']
+            stub_const("ARGV", ['foo', '--flag', 'value'])
             @app.run
             expect(@app.options[:flag]).to eq('value')
           end
@@ -251,7 +245,7 @@ describe Moses do
 
         context 'without value' do
           it "creates a boolean option" do
-            ARGV = ['foo', '--flag']
+            stub_const("ARGV", ['foo', '--flag'])
             @app.run
             expect(@app.options[:flag]).to be_true
           end
@@ -261,29 +255,29 @@ describe Moses do
 
     describe "running commands" do
       it "sends the command if it is in the commands white list" do
-        ARGV = ['foo']
+        stub_const("ARGV", ['foo'])
         @app.stub(:foo)
         @app.should_receive(:foo)
         @app.run
       end
 
       it "does not send a command if it is not in the commands white list" do
-        ARGV = ['baz']
+        stub_const("ARGV", ['baz'])
         @app.should_not_receive(:baz)
         @app.run
       end
 
       it "does not send a command if the method is not defined" do
-        ARGV = ['bar']
+        stub_const("ARGV", ['bar'])
         @app.should_not_receive(:bar)
         @app.run
       end
 
       it "runs any option commands if the option was passed" do
-        ARGV = ['-h']
+        stub_const("ARGV", ['-h'])
         @app.should_receive(:help)
         @app.run
       end
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: moses
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-21 00:00:00.000000000 Z
+date: 2013-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -134,7 +134,6 @@ files:
 - spec/application_spec.rb
 - spec/moses_spec.rb
 - spec/spec_helper.rb
-- test.rb
 homepage: http://github.com/daytonn/moses
 licenses:
 - Apache 2.0
@@ -150,7 +149,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2029242143119377682
+      hash: -2311972291789989622
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/test.rb

@@ -1,27 +0,0 @@
-require 'pry'
-
-module Foo
-
-  def self.included(base)
-    base.extend(ClassMethods)
-  end
-
-  module ClassMethods
-    def commands(*args)
-      class_eval %Q{
-        def commands
-          @commands ||= #{args}
-        end
-      }
-    end
-  end
-end
-
-class Bar
-  include Foo
-
-  commands :foo, :bar
-end
-
-b = Bar.new
-puts b.commands