temp 0.0.3 → 0.0.4

data/lib/temp.rb

@@ -1,3 +1,4 @@
+require 'temp/options'
 require 'temp/config'
 require 'temp/tempfile'
 require 'temp/template'

data/lib/temp/config.rb

@@ -12,9 +12,9 @@ module Temp
     attr_reader :file, :vals, :template_dir
     attr_accessor :template_options
 
-    # Load a configuration file and set the configuration variables to the
-    # values in the file. If not given a filename, load the default
-    # configuration file. If the configuration file doesn't exist, use default
+    # Loads a configuration file and sets the configuration variables to the
+    # values in the file. If not given a filename, loads the default
+    # configuration file. If the configuration file doesn't exist, uses default
     # configuration values. Also accepts template options to make it easier to
     # pass to tempfiles.
     def initialize(file = DEFAULT_CONF_FILE, template_options = {})

data/lib/temp/options.rb

@@ -0,0 +1,44 @@
+module Temp
+
+  # The Options module contains functions for parsing command line options.
+  module Options
+
+    # Parses arguments and returns a hash of options.
+    def self.parse(args)
+      options = { :args => [] }
+
+      opt_stop = false
+      args.each do |arg|
+        if arg == '--'
+          opt_stop = true 
+          next
+        end
+
+        if opt_stop
+          options[:args] << arg
+        else
+          match = /^(-)?(-no)?((-\w+)+)(=(.+))?$/.match(arg)
+          if match
+            key = match[3].sub('-', '').gsub('-', '_').to_sym
+
+            if match[5]
+              options[key] = match[6]
+            elsif match[2]
+              options[key] = false
+            else
+              options[key] = true
+            end
+
+            opt_stop = true if match[1]
+          else
+            options[:args] << arg
+          end
+        end
+      end
+
+      options
+    end
+
+  end
+
+end

data/lib/temp/runner.rb

@@ -5,41 +5,27 @@ module Temp
   # The Runner module contains methods for Temp's command line interface.
   module Runner
 
-    # Run Temp as a command line program
+    def self.help
+      puts 'Usage: temp [options] [project] [template]'
+    end
+
+    # Runs Temp as a command line program
     def self.start!(args)
       conf = Temp::Config.new(Temp::Config::DEFAULT_CONF_FILE)
-      options = {}
-
-      OptionParser.new do |o|
-        o.banner = 'Usage: temp [options] [project] [template]'
-
-        o.on('-v', '--version', 'Show version information') do
-          puts "Temp #{Temp::VERSION}"
-          exit
-        end
-
-        o.on('-l', '--list [name]', 'List all templates') do |name|
-          if name
-            t = Temp::Template.new(name, conf)
-            puts "#{t.name} - #{t.desc}"
-          else
-            Temp::Template.all(conf).each do |t|
-              puts "#{t.name} - #{t.desc}"
-            end
-          end
-          exit
-        end
-
-        o.on('-t', '--template-options [opts]',
-        'Pass comma-separated option flags to the template') do |opts|
-          opts.split(',').each { |o| options[o.to_sym] = true }
-        end
-      end.parse!(args)
+      options = Temp::Options.parse(args)
       conf.template_options = options
 
-      if ARGV.size == 0
+      if options[:h] || options[:help]
+        help
+        exit
+      elsif options[:v] || options[:version]
+        puts "Temp #{Temp::VERSION}"
+        exit
+      end
+
+      if options[:args].size == 0
         puts 'No template specified.'
-      elsif ARGV.size == 1
+      elsif options[:args].size == 1
         template = Temp::Template.new(ARGV[0], conf)
         Temp::Project.new(Dir.pwd, template).create
       else
@@ -52,8 +38,6 @@ module Temp
         puts 'Cannot create project because file exists there.'
       when Temp::Exceptions::TemplateNonExistentError
         puts 'The specified template does not exist.'
-      when OptionParser::InvalidOption
-        puts e.message
       else
         raise e
       end

data/lib/temp/tempfile.rb

@@ -5,7 +5,7 @@ module Temp
 
     attr_reader :options, :info, :ignore_files, :erb_files
 
-    # Load a Tempfile in the specified directory. Options can be passed so that
+    # Loads a Tempfile in the specified directory. Options can be passed so that
     # they can be accessed from the Tempfile.
     def initialize(dir, options = {})
       @dir = File.expand_path(dir)
@@ -17,29 +17,29 @@ module Temp
       instance_eval File.read(@file) if File.file? @file
     end
 
-    # Public method to get the object's binding
+    # Gets the object's binding
     def get_binding
       binding
     end
 
-    # Set the template name
+    # Sets the template name
     def name(str)
       info[:name] = str
     end
 
-    # Set the template description
+    # Sets the template description
     def desc(str)
       info[:desc] = str
     end
 
-    # Add files to the ignore list by expanding the given glob(s)
+    # Adds files to the ignore list by expanding the given glob(s)
     def ignore(*files)
       @ignore_files |= files.map do |file|
         Dir.glob(File.join(@dir, file)).map { |f| f.sub(@dir + '/', '') }
       end.flatten
     end
 
-    # Add files to the ERB list by expanding the given glob(s)
+    # Adds files to the ERB list by expanding the given glob(s)
     def use_erb(*files)
       @erb_files |= files.map do |file|
         Dir.glob(File.join(@dir, file)).map { |f| f.sub(@dir + '/', '') }

data/lib/temp/template.rb

@@ -7,7 +7,7 @@ module Temp
 
     attr_reader :conf, :tempfile, :path, :filename, :name, :desc, :files
 
-    # Return an array of all templates in the template directory
+    # Returns an array of all templates in the template directory
     def self.all(conf)
       Dir.entries(conf.template_dir).map do |t|
         unless t == '.' || t == '..'
@@ -16,7 +16,7 @@ module Temp
       end.compact
     end
 
-    # Load a template
+    # Loads a template
     def initialize(name, conf)
       @conf = conf
       @path = File.join(@conf.template_dir, name)
@@ -29,7 +29,7 @@ module Temp
       @files = Template.find_files(@path) - @tempfile.ignore_files
     end
 
-    # Find all of the files in a path
+    # Finds all of the files in a path
     def self.find_files(path)
       path = File.expand_path(path)
       Dir.glob(File.join(path, '**/*')).map { |f| f.sub(path + '/', '') }

data/lib/temp/version.rb

@@ -1,3 +1,3 @@
 module Temp
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/temp_spec.rb

@@ -39,6 +39,40 @@ describe Temp do
     FileUtils.rm_r(@test_dir)
   end
 
+  describe Temp::Options do
+
+    it 'should have the correct arguments' do
+      Temp::Options.parse(['foo', 'bar'])[:args].should == ['foo', 'bar']
+    end
+
+    it 'should have the correct options' do
+      options = Temp::Options.parse(['-f', '-bar-baz'])
+      options[:f].should be_true
+      options[:bar_baz].should be_true
+    end
+
+    it 'should set "no" options to false' do
+      Temp::Options.parse(['-no-baz'])[:baz].should be_false
+    end
+
+    it 'should stop parsing options after a --' do
+      options = Temp::Options.parse(['-foo', '--', '-bar'])
+      options[:foo].should be_true
+      options[:args].should == ['-bar']
+    end
+
+    it 'should stop parsing options after an option with --' do
+      options = Temp::Options.parse(['--stop-hammertime', '-foo'])
+      options[:args].should == ['-foo']
+      options[:stop_hammertime].should be_true
+    end
+
+    it 'should set an option to a given value' do
+      Temp::Options.parse(['-foo=bar'])[:foo].should == 'bar'
+    end
+
+  end
+
   describe Temp::Config do
 
     it 'should load the config file' do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Austin Gatchell
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-09 00:00:00 -05:00
+date: 2011-10-16 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -50,6 +50,7 @@ files:
 - lib/temp.rb
 - lib/temp/config.rb
 - lib/temp/exceptions.rb
+- lib/temp/options.rb
 - lib/temp/project.rb
 - lib/temp/runner.rb
 - lib/temp/tempfile.rb