clive 0.7.0 → 0.7.1

data/lib/clive.rb

@@ -1,4 +1,18 @@
+require 'ast_ast'
+
 require 'clive/parser'
+require 'clive/exceptions'
+require 'clive/tokens'
+require 'clive/ext'
+
+require 'clive/option'
+require 'clive/command'
+require 'clive/switch'
+require 'clive/flag'
+require 'clive/bool'
+
+require 'clive/output'
+require 'clive/formatter'
 
 # Clive is a simple dsl for creating command line interfaces
 #

data/lib/clive/bool.rb

@@ -34,7 +34,7 @@ module Clive
         if truth
           @names << i.to_s
         else
-          @names << "no-#{i.to_s}" if i.length > 1
+          @names << "no-#{i.to_s}" if i.to_s.length > 1
         end
       end
       

data/lib/clive/command.rb

@@ -38,8 +38,8 @@ module Clive
       else
         args.each do |i|
           case i
-          when Symbol
-            @names << i.to_s
+          when ::Array
+            @names = i.map {|i| i.to_s }
           when String
             @desc = i
           end
@@ -160,7 +160,7 @@ module Clive
         t = commands[command].tokenize(post_command)
         r << [:command, commands[command], t]
       end
-
+      
       r
     end
     
@@ -219,7 +219,7 @@ module Clive
     #   and flags
     #
     def command(*args, &block)
-      @commands << Command.new(*args, @current_desc, &block)
+      @commands << Command.new(args, @current_desc, &block)
       @current_desc = ""
     end
     

data/lib/clive/formatter.rb

@@ -1,5 +1,3 @@
-require 'strscan'
-
 module Clive
   
   # The formatter controls formatting of help. It can be configured
@@ -113,23 +111,14 @@ module Clive
     
     def parse_format(format, args)
       if format
-        @scanner = StringScanner.new(format)
-        result = []
-  
-        # Create object to eval in
+        tokens = Lexer.tokenise(format).to_a
         obj = Obj.new(args)
-        
-        until @scanner.eos?
-          a = scan_block || a = scan_text
-          result << a
-        end
-        
         r = ""
-        result.each do |(t, v)|
+        tokens.each do |(t,v)|
           case t
-          when :block # contains ruby to eval
+          when :block
             r << obj.evaluate(v)
-          when :text # add this with no adjustment
+          when :text 
             r << v
           end
         end
@@ -139,42 +128,19 @@ module Clive
       end
     end
     
+    class Lexer < Ast::Tokeniser
+      rule :text, /%(.)/ do |i|
+        i[1]
+      end
     
-    # @group Scanning     
-      def scan_block
-        return unless @scanner.scan /\{/
-        
-        pos = @scanner.pos
-        if @scanner.scan_until /\}/
-          @scanner.pos -= @scanner.matched.size
-          [:block, @scanner.pre_match[pos..-1]]
-        end
+      rule :block, /\{(.*?)\}/ do |i|
+        i[1]
       end
       
-      def scan_text
-        text = nil
-        
-        pos = @scanner.pos
-        if @scanner.scan_until /(?<=[^\\])\{/
-          @scanner.pos -= @scanner.matched.size
-          text = @scanner.pre_match[pos..-1]
-        end
-        
-        if text.nil?
-          text = @scanner.rest
-          @scanner.clear
-        end
-        
-        # Remove }s from text
-        if text[0] == "}"
-          text = text[1..-1]
-        end
-        
-        text.gsub!(/\\(.)/) {|m| m[1] }
-                
-        [:text, text]
+      missing do |i|
+        Ast::Token.new(:text, i)
       end
-    # @endgroup
+    end
   
   end
 end

data/lib/clive/parser.rb

@@ -1,17 +1,3 @@
-require 'clive/exceptions'
-require 'clive/tokens'
-require 'clive/ext'
-
-require 'clive/option'
-require 'clive/command'
-require 'clive/switch'
-require 'clive/flag'
-require 'clive/bool'
-
-require 'clive/output'
-require 'clive/formatter'
-
-
 module Clive
 
   # A module wrapping the command line parsing of clive. In the future this

data/lib/clive/tokens.rb

@@ -64,19 +64,18 @@ module Clive
     def tokens
       t = []
       self.each do |i|
-        if i[0..1] == "--"
+        case i
+        when /\-\-.+/
           if i.include?('=')
             a, b = i[2..i.length].split('=')
             t << [:long, a] << [:word, b]
           else
             t << [:long, i[2..i.length]]
           end
-          
-        elsif i[0] == "-"
+        when /\-.+/
           i[1..i.length].split('').each do |j|
             t << [:short, j]
           end
-        
         else
           t << [:word, i]
         end

data/lib/clive/version.rb

@@ -1,3 +1,3 @@
 module Clive
-  VERSION = '0.7.0'
+  VERSION = '0.7.1'
 end

data/spec/clive/bool_spec.rb

@@ -2,8 +2,8 @@ require 'spec_helper'
 
 describe Clive::Bool do
 
-  subject { Clive::Bool.new([:n, :name], "A test", true) {|arg| puts arg } }
-  let(:falsey) { Clive::Bool.new([:n, :name], "A test", false) {|arg| puts arg } }
+  subject { Clive::Bool.new([:n, :name], "A test", true) {|arg| $stdout.puts arg } }
+  let(:falsey) { Clive::Bool.new([:n, :name], "A test", false) {|arg| $stdout.puts arg } }
 
   describe "#truth" do
     it "returns the truth" do

data/spec/clive/command_spec.rb

@@ -7,7 +7,7 @@ describe Clive::Command do
   end
   
   subject { 
-    Clive::Command.new(:co, :comm, "A command") do
+    Clive::Command.new([:co, :comm], "A command") do
       bool(:boo) {}
       switch(:swi) {}
       flag(:fla) {}
@@ -19,7 +19,7 @@ describe Clive::Command do
   
   describe "#initialize" do
     subject { 
-      Clive::Command.new(:com, "A command") do
+      Clive::Command.new([:com], "A command") do
         flag(:test)
       end
     }

data/spec/clive/flag_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Clive::Flag do
 
-  subject { Clive::Flag.new([:S, :say], "Say something", ["WORD(S)"]) {|i| puts i } }
+  subject { Clive::Flag.new([:S, :say], "Say something", ["WORD(S)"]) {|i| $stdout.puts i } }
 
   it_behaves_like "an option"
   

data/spec/clive/formatter_spec.rb

@@ -14,7 +14,7 @@ describe Clive::Formatter do
     describe "#evaluate" do
       it "evaluates code within the object" do
         $stdout.should_receive(:puts).with(5)
-        subject.evaluate("puts test")
+        subject.evaluate("$stdout.puts test")
       end
     end
   end
@@ -62,7 +62,7 @@ describe Clive::Formatter do
         Clive::Flag.new([:args], "With args", ["ARG [OPT]"]),
         Clive::Flag.new([:choose], "With options", [["a", "b", "c"]])
       ]
-      command = Clive::Command.new(:command, "A command")
+      command = Clive::Command.new([:command], "A command")
       result = <<EOS
 head
 

data/spec/clive/option_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Clive::Option do
-  subject { Clive::Option.new([:n, :names], "A test option") { puts "hi" } }
+  subject { Clive::Option.new([:n, :names], "A test option") { $stdout.puts "hi" } }
 
   it_behaves_like "an option"
   

data/spec/clive/switch_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Clive::Switch do
-  subject { Clive::Switch.new([:n, :names], "A description") { puts "hi" } }
+  subject { Clive::Switch.new([:n, :names], "A description") { $stdout.puts "hi" } }
 
   it_behaves_like "an option"
   

data/spec/spec_helper.rb

@@ -1,7 +1,7 @@
-# $: << File.join(File.dirname(__FILE__), '..')
-# $: << File.dirname(__FILE__)
-require 'duvet'
-Duvet.start :filter => 'clive/lib'
+if RUBY_VERSION >= "1.9"
+  require 'duvet'
+  Duvet.start :filter => 'clive/lib'
+end
 
 require 'rspec'
 require 'clive'

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 7
-  - 0
-  version: 0.7.0
+  - 1
+  version: 0.7.1
 platform: ruby
 authors: 
 - Joshua Hawxwell
@@ -14,10 +14,24 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-06 00:00:00 +00:00
+date: 2011-01-07 00:00:00 +00:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: ast_ast
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 2
+        - 1
+        version: 0.2.1
+  type: :runtime
+  version_requirements: *id001
 description: "    Clive provides a DSL for building command line interfaces. It allows \n    you to define commands, switches, flags (switches with options) and \n    boolean switches, it then parses the input and runs the correct blocks.\n"
 email: m@hawx.me
 executables: []