martin 0.1.2 → 0.1.3

data/.document

@@ -1,4 +1,4 @@
-README.rdoc
+README.md
 lib/**/*.rb
 bin/*
 features/**/*.feature

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/examples/simple/simple.rb

@@ -0,0 +1,36 @@
+libdir = File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)
+
+require 'martin'
+require 'highline/import'
+require 'yaml'
+require 'pp'
+
+class SavedArray < Array
+    attr_accessor :filename
+    def initialize(filename)
+        load(filename)
+    end
+    def load(filename)
+        @filename = filename unless filename.nil?
+        replace YAML.load_file(@filename) if File.exist?(@filename)
+    end
+    def save
+        File.open(@filename, 'w+') do |f|
+            f.puts self.to_yaml
+        end
+    end
+end
+
+configure do
+    @users = SavedArray.new('users.yml')
+end
+
+command(/create (.+)/) do |name|
+    @users << name
+    @users.save
+end
+
+command(/list/)do |name|
+    puts @users
+end

data/examples/simple/users.yml

@@ -0,0 +1,3 @@
+--- !seq:SavedArray 
+- Ryguy
+- Ryguy

data/lib/martin.rb

@@ -1,5 +1,9 @@
-libdir = File.dirname(__FILE__)
-$LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)
-
-require 'martin/base'
-require 'martin/application'
+libdir = File.dirname(__FILE__)
+$LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)
+
+require 'martin/application'
+require 'martin/delegator'
+include Martin
+
+Delegator.delegate Application, :configure, :command, :error, :run
+Application.run

data/lib/martin/application.rb

@@ -1,33 +1,11 @@
-require File.dirname(__FILE__) + '/base'
-
-module Martin
-    # Martin delegation mixin. Mixing this module into an object causes all
-    # methods to be delegated to the Martin::Application class. Used primarily
-    # at the top-level.
-    # 100% ripped from Sinatra::Delegator
-    module Delegator #:nodoc:
-        def self.delegate(*methods)
-            methods.each do |method_name|
-                eval <<-RUBY, binding, '(__DELEGATE__)', 1
-                    def #{method_name}(*args, &b)
-                        ::Martin::Application.send(#{method_name.inspect}, *args, &b)
-                    end
-                    private #{method_name.inspect}
-                RUBY
-            end
-        end
-
-        delegate :configure, :command, :error, :run
-    end
-    
-    # This is the class that gets loaded if you just require 'martin'
-    class Application < Base
-        error do |input|
-            puts 'Could not find method ' + input.split.first
-        end
-    end
-    
-    at_exit { Application.run }
-end
-
-include Martin::Delegator
+require File.join(File.dirname(__FILE__), 'base')
+
+module Martin
+    # This is the class that gets loaded if you
+    # just require 'martin' AKA 'classic' style
+    class Application < Base
+        error do |input|
+            puts 'Could not find method ' + input.split.first
+        end
+    end
+end

data/lib/martin/base.rb

@@ -1,71 +1,87 @@
-require File.dirname(__FILE__) + '/dsl'
-
-# An ode to the Rat Pack (Dean Martin) with a Sinatra style DSL for creating 
-# Command Line Interfaces to your applications
-module Martin
-    module InstanceMethods
-        
-    end
-    
-    module ClassMethods
-        Configures, Commands, Errors = [], [], []
-        
-        # Runs once, at the beginning of the application
-        # If there are multiple configure blocks, then each one will run in the
-        # order the were created.
-        #
-        # @param [Regexp] cmd the regexp you want to match to run the command
-        def configure(&block)
-            Configures << DSL::Configure.new(block)
-        end
-        
-        # Adds a command
-        #
-        # @param [Regexp] cmd the regexp you want to match to run the command
-        def command(regexp, &block)
-            Commands << DSL::Command.new(regexp, block)
-        end
-        
-        # When the user input matches non of the user's commands then this
-        # method will run
-        # If there are multiple error blocks, then each one will run in the
-        # order the were created.
-        #
-        # @param [Regexp] cmd the regexp you want to match to run the command
-        def error(&block)
-            Errors << DSL::Error.new(block)
-        end
-        
-        # Runs the application on the given arguments
-        #
-        # @param [String] args The arguments to run the application on. Default is ARGV.join(' ')
-        def run(args = ARGV.join(' '))
-            got_error = false
-            Configures.each do |configure|
-                configure.block.call
-            end
-            Commands.each do |command|
-                match = command.regexp.match(args)
-                unless match.nil?
-                    command.block.call(*match.captures)
-                    got_error = false
-                else
-                    got_error = true
-                end
-            end
-            Errors.each do |error|
-                error.block.call(args) if got_error
-            end
-            self
-        end
-    end
-    
-    # The base class for command line applications
-    # Subclass this class for the functionality
-    class Base
-        def self.inherited(base)
-            extend ClassMethods
-            include InstanceMethods
-        end
-    end
+require File.join(File.dirname(__FILE__), 'dsl')
+
+# TODO:
+#   DSL::Route - to handle all configure, command, and error blocks
+#   DSL::Router - To handle all of the routes
+#   
+#   When Martin::Base.run('some input here') is called:
+#       Run all of the configure blocks
+#       Check to see if the input matches any of the command blocks
+#           if it matches any then
+#               run the first matched block
+#               if the first matched block uses the method 'pass' then
+#                   run the next matched block
+#           else
+#               Check to see if input matches any of the error blocks
+#                   if it matches any then
+#                       run the first error block
+#                       if the first error block uses the method 'pass' then
+#                           run the next error block
+#           end
+
+# An ode to the Rat Pack (Dean Martin) with a Sinatra style DSL for creating 
+# Command Line Interfaces to your applications
+module Martin
+    module InstanceMethods
+        
+    end
+    
+    module ClassMethods
+        Configures, Commands, Errors = [], [], []
+        
+        # Runs once, at the beginning of the application
+        # If there are multiple configure blocks, then each one will run in the
+        # order the were created.
+        #
+        # @param [Regexp] cmd the regexp you want to match to run the command
+        def configure(&block)
+            Configures << DSL::Configure.new(block)
+        end
+        
+        # Adds a command
+        #
+        # @param [Regexp] cmd the regexp you want to match to run the command
+        def command(regexp, &block)
+            Commands << DSL::Command.new(regexp, block)
+        end
+        
+        # When the user input matches non of the user's commands then this
+        # method will run
+        # If there are multiple error blocks, then each one will run in the
+        # order the were created.
+        #
+        # @param [Regexp] cmd the regexp you want to match to run the command
+        def error(&block)
+            Errors << DSL::Error.new(block)
+        end
+        
+        # Runs the application on the given arguments
+        #
+        # @param [String] args The arguments to run the application on. Default is ARGV.join(' ')
+        def run(args = ARGV.join(' '))
+            Configures.each do |configure|
+                configure.block.call
+            end
+            Commands.each do |command|
+                match = command.regexp.match(args)
+                unless match.nil?
+                    command.block.call(*match.captures)
+                else
+                    Errors.each do |error|
+                        error.block.call(args)
+                    end
+                end
+            end
+            self
+        end
+    end
+    
+    # The base class for command line applications
+    # Subclass this class for the functionality
+    class Base
+        def self.inherited(base)
+            extend ClassMethods
+            include InstanceMethods
+        end
+    end
 end

data/lib/martin/delegator.rb

@@ -0,0 +1,19 @@
+module Martin
+    # Martin delegation mixin. Mixing this module into an object causes all
+    # methods to be delegated to the Martin::Application class. Used primarily
+    # at the top-level.
+    # 
+    # 92% ripped from Sinatra::Delegator
+    module Delegator #:nodoc:
+        def self.delegate(mod, *methods)
+            methods.each do |method_name|
+                eval <<-RUBY, binding, '(__DELEGATE__)', 1
+                    def #{method_name}(*args, &b)
+                        mod.send(#{method_name.inspect}, *args, &b)
+                    end
+                    private #{method_name.inspect}
+                RUBY
+            end
+        end
+    end
+end

data/lib/martin/dsl.rb

@@ -1,39 +1,31 @@
-class Object
-    # Throw a TypeError unless this object's type is cls
-    #
-    # @param cls The class this object should be
-    def should_be_a(cls)
-        raise(TypeError, "#{self.to_s} must be of type #{cls.to_s}") unless self.is_a?(cls)
-    end
-end
-
-module Martin
-    module DSL
-        # This is just an Array that checks the type of the object being pushed to it
-        class TypeList < Array
-            def <<(obj)
-                obj.should_be_a(@containing_type || Object)
-                super
-            end
-        end
-        
-        class Method
-            attr_accessor :block
-            def initialize(block)
-                block.should_be_a(Proc)
-                @block = block
-            end
-        end
-        
-        class Configure < Method; end
-        class Command < Method
-            attr_accessor :regexp
-            def initialize(regexp, block)
-                super(block)
-                regexp.should_be_a(Regexp)
-                @regexp = regexp
-            end
-        end
-        class Error < Method; end
-    end
+class Object
+    # Throw a TypeError unless this object's type is cls
+    #
+    # @param cls The class this object should be
+    def should_be_a(cls)
+        raise(TypeError, "#{self.to_s} must be of type #{cls.to_s}") unless self.is_a?(cls)
+    end
+end
+
+module Martin
+    module DSL
+        class Method
+            attr_accessor :block
+            def initialize(block)
+                block.should_be_a(Proc)
+                @block = block
+            end
+        end
+        
+        class Configure < Method; end
+        class Command < Method
+            attr_accessor :regexp
+            def initialize(regexp, block)
+                super(block)
+                regexp.should_be_a(Regexp)
+                @regexp = regexp
+            end
+        end
+        class Error < Method; end
+    end
 end

data/martin.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{martin}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ryan Lewis"]
-  s.date = %q{2010-04-17}
+  s.date = %q{2010-04-19}
   s.description = %q{An ode to the Rat Pack (Dean Martin) with a Sinatra style DSL for creating command line interfaces to your applications}
   s.email = %q{c00lryguy@gmail.com}
   s.extra_rdoc_files = [
@@ -23,9 +23,12 @@ Gem::Specification.new do |s|
      "README.md",
      "Rakefile",
      "VERSION",
+     "examples/simple/simple.rb",
+     "examples/simple/users.yml",
      "lib/martin.rb",
      "lib/martin/application.rb",
      "lib/martin/base.rb",
+     "lib/martin/delegator.rb",
      "lib/martin/dsl.rb",
      "martin.gemspec",
      "test/helper.rb",
@@ -38,7 +41,8 @@ Gem::Specification.new do |s|
   s.summary = %q{A Sinatra style DSL for creating command line applications}
   s.test_files = [
     "test/helper.rb",
-     "test/test_martin.rb"
+     "test/test_martin.rb",
+     "examples/simple/simple.rb"
   ]
 
   if s.respond_to? :specification_version then

data/test/helper.rb

@@ -6,9 +6,6 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'martin/base'
 
-class Test::Unit::TestCase
-end
-
 class Calculator
     def add(*nums)
         nums.reduce(:+)

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Ryan Lewis
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-17 00:00:00 -04:00
+date: 2010-04-19 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -45,9 +45,12 @@ files:
 - README.md
 - Rakefile
 - VERSION
+- examples/simple/simple.rb
+- examples/simple/users.yml
 - lib/martin.rb
 - lib/martin/application.rb
 - lib/martin/base.rb
+- lib/martin/delegator.rb
 - lib/martin/dsl.rb
 - martin.gemspec
 - test/helper.rb
@@ -85,3 +88,4 @@ summary: A Sinatra style DSL for creating command line applications
 test_files: 
 - test/helper.rb
 - test/test_martin.rb
+- examples/simple/simple.rb