mint 0.1.4 → 0.1.5

data/bin/mint

@@ -11,25 +11,9 @@ module Mint
     # A map of all options that OptParse will accept from the commandline.
     # All other arguments are taken to be filenames.
     def self.options
-      {
-        # These options take parameters
-        template: ['t', 'template', true, 'Specify the template (layout + style).'],
-        layout: ['l', 'layout', true, 'Specify only the layout.'],
-        style: ['s', 'style', true, 'Specify only the style.'],
-        root: ['w', 'root', true, 'Specify a root outside the current directory.'],
-        destination: ['d', 'destination', true, 
-          'Specify a destination directory, relative to the root.'],
-        style_destination: ['n', 'style-destination', true, 
-          'Specify a destination directory for stylesheets, or nil to link in place'],
-
-        # These options do not take parameters
-        global: ['G', 'global', false, 'Specify config changes on a global level.'],
-        user: ['U', 'user', false, 'Specify config changes on a user-wide level.'],
-        local: ['L', 'local', false, 'Specify config changes on a project-specific level.'],
-        force: ['f', 'force', false, 'Force file overwrite without prompt.'],
-        verbose: ['v', 'verbose', false, 'Verbose output.'],
-        simulation: ['s', 'simulation', false, 'Simulate transformation without actually creating files.']
-      }
+      # Options file, relative to this one
+      options_file = '../../config/options.yaml'
+      YAML.load_file File.expand_path(options_file, __FILE__)
     end
 
     def self.config_options
@@ -42,7 +26,7 @@ module Mint
         select(&:exist?).
         map {|p| YAML.load_file p }.
         reverse.
-        reduce(Hash.new) {|r,p| r.merge p }
+        reduce(Mint.default_options) {|r,p| r.merge p }
     end
 
     def self.full_options_with(commandline_options)
@@ -102,19 +86,19 @@ commandline_options = {}
 optparse = OptionParser.new do |opts|
   opts.banner = 'Usage: mint [command] files [options]'
 
-  Mint::Commandline.options.each do |k,v|
-    has_param = v[2]
+  Mint::CommandLine.options.each do |k,v|
+    has_param = v['parameter']
 
-    v[0] = "-#{v[0]}"
-    v[1] = "--#{v[1]}"
+    v['short'] = "-#{v['short']}"
+    v['long'] = "--#{v['long']}"
 
     if has_param
-      v[1] << " PARAM"
-      opts.on v[0], v[1], v[3] do |p|
-        commandline_options[k] = p
+      v['long'] << " PARAM"
+      opts.on v['short'], v['long'], v['description'] do |p|
+        commandline_options[k.to_sym] = p
       end
     else
-      opts.on v[0], v[1], v[3] do
+      opts.on v['short'], v['long'], v['description'] do
         commandline_options[k] = true
       end
     end

data/config/options.yaml

@@ -0,0 +1,72 @@
+template:
+  short: t
+  long: template
+  parameter: true
+  description: 'Specify the template (layout + style).'
+
+layout:
+  short: l
+  long: layout
+  parameter: true
+  description: 'Specify only the style'
+
+style:
+  short: s
+  long: style
+  parameter: true
+  description: 'Specify only the style.'
+
+root:
+  short: w
+  long: r
+  parameter: true
+  description: 'Specify a root outside the current directory.'
+
+destination:
+  short: d
+  long: destination
+  parameter: true 
+  description: 'Specify a destination directory, relative to the root.'
+
+style_destination:
+  short: n
+  long: style-destination
+  parameter: true
+  description: 'Specify a destination directory for stylesheets, or nil to link in place'
+
+global:
+  short: G
+  long: global
+  parameter: false
+  description: 'Specify config changes on a global level.'
+
+user:
+  short: U
+  long: user
+  parameter: false
+  description: 'Specify config changes on a user-wide level.'
+
+
+local:
+  short: L
+  long: local
+  parameter: false
+  description: 'Specify config changes on a project-specific level.'
+
+force:
+  short: f
+  long: force
+  parameter: false
+  description: 'Force file overwrite without prompt.'
+
+verbose:
+  short: v
+  long: verbose
+  parameter: false
+  description: 'Verbose output.'
+
+simulation:
+  short: s
+  long: simulation
+  parameter: false
+  description: 'Simulate transformation without actually creating files.'

data/lib/mint.rb

@@ -1,2 +1,3 @@
+require 'mint/helpers'
 require 'mint/mint'
 require 'mint/version'

data/lib/mint/mint.rb

@@ -1,7 +1,6 @@
 require 'pathname'
 require 'fileutils'
 require 'tilt'
-require 'helpers'
 
 module Mint
 
@@ -11,7 +10,7 @@ module Mint
   Tilt.register 'html', Tilt::ERBTemplate
   Tilt.register 'css', Tilt::LessTemplate
 
-  def root
+  def self.root
     Pathname.new(__FILE__).realpath.dirname + '../..'
   end
 
@@ -20,7 +19,8 @@ module Mint
   # Either way, earlier/higher paths take precedence. And is considered to
   # be the directory for "local" config options, templates, etc.
   def self.path
-    mint_path = ENV['MINT_PATH'] || "#{Dir.getwd}/.mint:~/.mint:#{MINT_DIR}"
+    mint_path = ENV['MINT_PATH'] || 
+      "#{Dir.getwd}/.mint:~/.mint:#{Mint.root}"
     mint_path.split(':').map {|p| Pathname.new(p).expand_path }
   end
 

data/lib/mint/version.rb

@@ -0,0 +1,3 @@
+module Mint
+  VERSION = '0.1.5'
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - David Jacobs
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-01 00:00:00 -05:00
+date: 2011-02-02 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -44,6 +44,8 @@ files:
 - lib/mint.rb
 - lib/mint/mint.rb
 - lib/mint/helpers.rb
+- lib/mint/version.rb
+- config/options.yaml
 has_rdoc: true
 homepage: http://github.com/davejacobs/mint
 licenses: []