lightning 0.3.2 → 0.3.3

data/.gemspec

@@ -0,0 +1,26 @@
+# -*- encoding: utf-8 -*-
+require 'rubygems' unless Object.const_defined?(:Gem)
+require File.dirname(__FILE__) + "/lib/lightning/version"
+
+Gem::Specification.new do |s|
+  s.name        = "lightning"
+  s.version     = Lightning::VERSION
+  s.authors     = ["Gabriel Horner"]
+  s.email       = "gabriel.horner@gmail.com"
+  s.homepage    = "http://tagaholic.me/lightning/"
+  s.summary = "Lightning is a commandline framework that generates shell functions which wrap around commands to autocomplete and translate full paths by their basenames."
+  s.description = "Lightning is a commandline framework that lets users wrap commands with shell functions that are able to refer to any filesystem path by its basename. To achieve this, a group of paths to be translated are defined with shell globs. These shell globs, known as a lightning _bolt_, are then applied to commands to produce functions. In addition to translating basenames to full paths, lightning _functions_ can autocomplete these basenames, resolve conflicts if they have the same name, leave any non-basename arguments untouched, and autocomplete directories above and below a basename. To make bolts shareable between users and functions easier to create, lightning has _generators_. A _generator_ generates filesystem-specific globs for a bolt. Lightning comes with some default generators. Users can make their own generators with generator plugins placed under ~/.lightning/generators/."
+  s.required_rubygems_version = ">= 1.3.6"
+  s.rubyforge_project = 'tagaholic'
+  s.executables = %w{lightning lightning-complete lightning-translate}
+  s.has_rdoc = 'yard'
+  s.rdoc_options = ['--title', "Lightning #{Lightning::VERSION} Documentation"]
+  s.add_development_dependency 'bacon', '>= 1.1.0'
+  s.add_development_dependency 'rr', '>= 1.0'
+  s.add_development_dependency 'bacon-bits'
+  s.add_development_dependency 'bacon-rr'
+  s.files = Dir.glob(%w[{lib,test}/**/*.rb bin/* [A-Z]*.{txt,rdoc} ext/**/*.{rb,c} **/deps.rip]) + %w{Rakefile .gemspec}
+  s.files += Dir.glob(['test/*.yml', 'man/*'])
+  s.extra_rdoc_files = ["README.rdoc", "LICENSE.txt"]
+  s.license = 'MIT'
+end

data/CHANGELOG.rdoc

@@ -1,3 +1,7 @@
+== 0.3.3
+* Disallow arbitrary methods to pass as commands to lightning
+* Remove jeweler from Rakefile
+
 == 0.3.2
 * Better tests
 * Added a manpage

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT LICENSE
 
-Copyright (c) 2009 Gabriel Horner
+Copyright (c) 2010 Gabriel Horner
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -1,5 +1,14 @@
 == Description
-Lightning is a commandline framework that lets users wrap commands with shell functions that are able to refer to any filesystem path by its basename. To achieve this, a group of paths to be translated are defined with shell globs. These shell globs, known as a lightning _bolt_, are then applied to commands to produce functions. In addition to translating basenames to full paths, lightning _functions_ can autocomplete these basenames, resolve conflicts if they have the same name, leave any non-basename arguments untouched, and autocomplete directories above and below a basename. To make bolts shareable between users and functions easier to create, lightning has _generators_. A _generator_ generates filesystem-specific globs for a bolt. Lightning comes with some default generators. Users can make their own generators with generator plugins placed under ~/.lightning/generators/.
+Lightning is a commandline framework that lets users wrap commands with shell functions that are
+able to refer to any filesystem path by its basename. To achieve this, a group of paths to be
+translated are defined with shell globs. These shell globs, known as a lightning _bolt_, are then
+applied to commands to produce functions. In addition to translating basenames to full paths,
+lightning _functions_ can autocomplete these basenames, resolve conflicts if they have the same
+name, leave any non-basename arguments untouched, and autocomplete directories above and below a
+basename. To make bolts shareable between users and functions easier to create, lightning has
+_generators_. A _generator_ generates filesystem-specific globs for a bolt. Lightning comes with
+some default generators. Users can make their own generators with generator plugins placed under
+~/.lightning/generators/.
 
 == Intro
 Lightning generates shell functions which can interpret paths by their basenames. So instead of carpal-typing
@@ -10,7 +19,8 @@ just type
 
   $ less-ruby irb.rb
 
-less-ruby is a lightning function which wraps `less` with the ability to refer to system ruby files by their basenames. Being a lightning function, it can also autocomplete system ruby files:
+less-ruby is a lightning function which wraps `less` with the ability to refer to system ruby files
+by their basenames. Being a lightning function, it can also autocomplete system ruby files:
 
   # 1112 available system ruby files
   $ less-ruby [TAB]
@@ -37,12 +47,14 @@ And here's the one-liner that creates this function:
 == Install
 
 Install with either rip or rubygems:
-  $ rip install git://github.com/cldwalker/lightning.git
+  $ rip install lightning
   # OR
-  $ sudo gem install yard # if you want lightning's documentation generated correctly
-  $ sudo gem install lightning
+  $ gem install yard # if you want lightning's documentation generated correctly
+  $ gem install lightning
 
-If you've installed with rubygems and `time lightning` takes longer than 0.05 seconds, I *strongly recommend* installing with rip. Your startup time directly effects your autocompletion speed with lightning.
+If you've installed with rubygems and `time lightning` takes longer than 0.05 seconds, I *strongly
+recommend* installing with rip. Your startup time directly effects your autocompletion speed with
+lightning.
 
 Once lightning is installed, we need to do a one-time setup:
 
@@ -51,7 +63,7 @@ Once lightning is installed, we need to do a one-time setup:
 
   # Installs lightning's core files and sources the needed lightning functions
   $ lightning install && source ~/.lightning/functions.sh
-  Created ~/.lightning_yml
+  Created ~/.lightningrc
   Created ~/.lightning/functions.sh
 
   # To have lightning's functionality loaded when your shell starts up
@@ -61,10 +73,7 @@ Once lightning is installed, we need to do a one-time setup:
 
 To install and view lightning's man page:
 
-  # If installed with rip
-  $ LDIR=`ruby -rrip -e 'puts Rip::PackageManager.new.package("lightning").cache_path'`
-  # Assumes /usr/local/man is in $MANPATH
-  $ cp $LDIR/man/lightning.1 /usr/local/man/man1/
+  # If installed with rip, man pages are automatically installed
   $ man lightning
 
   # If installed with rubygems
@@ -79,7 +88,8 @@ Please report them {on github}[http://github.com/cldwalker/lightning/issues].
 * Only bash and zsh shells are supported. Patches are welcome to support other shells.
 
 == Credits
-* ryanb's dotfiles inspired tinkering with autocompletion in ruby: http://github.com/ryanb/dotfiles/blob/master/bash/completion_scripts/project_completion
+* ryanb's dotfiles inspired tinkering with autocompletion in ruby:
+  http://github.com/ryanb/dotfiles/blob/master/bash/completion_scripts/project_completion
 * defunkt's rip, http://github.com/defunkt/rip, was influential in designing plugins
 * Bug fixes: ljsc
 

data/Rakefile

@@ -1,43 +1,35 @@
 require 'rake'
-begin
-  require 'rcov/rcovtask'
+require 'fileutils'
 
-  Rcov::RcovTask.new do |t|
-    t.libs << 'test'
-    t.test_files = FileList['test/**/*_test.rb']
-    t.rcov_opts = ["-T -x '/Library/Ruby/*'"]
-    t.verbose = true
-  end
-rescue LoadError
+def gemspec
+  @gemspec ||= eval(File.read('.gemspec'), binding, '.gemspec')
 end
 
-begin
-  require 'jeweler'
-  require File.dirname(__FILE__) + "/lib/lightning/version"
+desc "Build the gem"
+task :gem=>:gemspec do
+  sh "gem build .gemspec"
+  FileUtils.mkdir_p 'pkg'
+  FileUtils.mv "#{gemspec.name}-#{gemspec.version}.gem", 'pkg'
+end
 
-  Jeweler::Tasks.new do |s|
-    s.name = "lightning"
-    s.version = Lightning::VERSION
-    s.executables = ['lightning', 'lightning-complete', 'lightning-translate']
-    s.summary = "Lightning is a commandline framework that generates shell functions which wrap around commands to autocomplete and translate full paths by their basenames."
-    s.description = "Lightning is a commandline framework that lets users wrap commands with shell functions that are able to refer to any filesystem path by its basename. To achieve this, a group of paths to be translated are defined with shell globs. These shell globs, known as a lightning _bolt_, are then applied to commands to produce functions. In addition to translating basenames to full paths, lightning _functions_ can autocomplete these basenames, resolve conflicts if they have the same name, leave any non-basename arguments untouched, and autocomplete directories above and below a basename."
-    s.email = "gabriel.horner@gmail.com"
-    s.homepage = "http://tagaholic.me/lightning"
-    s.authors = ["Gabriel Horner"]
-    s.files =  FileList["CHANGELOG.rdoc", "Rakefile","README.rdoc", "LICENSE.txt", "{bin,lib,test,man}/**/*"]
-    s.has_rdoc = 'yard'
-    s.rdoc_options = ['--title', "Lightning #{Lightning::VERSION} Documentation"]
-    s.rubyforge_project = 'tagaholic'
-    s.extra_rdoc_files = ["README.rdoc", "LICENSE.txt"]
-  end
+desc "Install the gem locally"
+task :install => :gem do
+  sh %{gem install pkg/#{gemspec.name}-#{gemspec.version}}
+end
 
-rescue LoadError
-  puts "Jeweler not available. Install it for jeweler-related tasks with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
+desc "Generate the gemspec"
+task :generate do
+  puts gemspec.to_ruby
 end
 
-task :default => :test
+desc "Validate the gemspec"
+task :gemspec do
+  gemspec.validate
+end
 
-desc 'Run specs with unit test style output'
+desc 'Run tests'
 task :test do |t|
-  sh 'bacon -q -Ilib test/*_test.rb'
+  sh 'bacon -q -Ilib -I. test/*_test.rb'
 end
+
+task :default => :test

data/lib/lightning/commands.rb

@@ -34,7 +34,7 @@ module Lightning
     def run(argv=ARGV)
       if (command = argv.shift) && (actual_command = unalias_command(command))
         run_command(actual_command, argv)
-      elsif command && respond_to?(command)
+      elsif command && commands.include?(command)
         run_command(command, argv)
       elsif %w{-v --version}.include?(command)
         puts "lightning #{VERSION}"
@@ -112,4 +112,4 @@ module Lightning
   end
 end
 
-Lightning::Util.load_plugins File.dirname(__FILE__), 'commands'
+Lightning::Util.load_plugins File.dirname(__FILE__), 'commands'

data/lib/lightning/version.rb

@@ -1,3 +1,3 @@
 module Lightning
-  VERSION = '0.3.2'
+  VERSION = '0.3.3'
 end

data/test/commands_test.rb

@@ -58,7 +58,7 @@ context "Commands:" do
 
     test "with invalid command prints messaged and usage" do
       mock(Commands).print_help
-      capture_stdout { Commands.run ['blah'] }.should =~ /Command 'blah'/
+      capture_stdout { Commands.run ['to_s'] }.should =~ /Command 'to_s'/
     end
 
     test "passes -h as command argument" do
@@ -67,4 +67,4 @@ context "Commands:" do
       Commands.run(['complete', 'blah', '-h'])
     end
   end
-end
+end

data/test/deps.rip

@@ -0,0 +1,4 @@
+bacon >=1.1.0
+rr >=1.0
+bacon-bits >=0
+bacon-rr >=0

data/test/test_helper.rb

@@ -1,5 +1,7 @@
 require 'bacon'
+require 'bacon/bits'
 require 'rr'
+require 'bacon/rr'
 require 'lightning'
 #set up valid global config file
 Lightning::Config.config_file = File.join(File.dirname(__FILE__), 'lightning.yml')
@@ -35,59 +37,15 @@ module Helpers
   end
 end
 
-module BaconExtensions
-  def self.included(mod)
-    mod.module_eval do
-      # nested context methods automatically inherit methods from parent contexts
-      def describe(*args, &block)
-        context = Bacon::Context.new(args.join(' '), &block)
-        (parent_context = self).methods(false).each {|e|
-          class<<context; self end.send(:define_method, e) {|*args| parent_context.send(e, *args)}
-        }
-        @before.each { |b| context.before(&b) }
-        @after.each { |b| context.after(&b) }
-        context.run
-      end
-    end
-  end
-
-  def xtest(*args); end
-  def xcontext(*args); end
-  def before_all; yield; end
-  def after_all; yield; end
-  def assert(description, &block)
-    it(description) do
-      block.call.should == true
-    end
-  end
-end
-
 class Bacon::Context
   include Helpers
-  include BaconExtensions
-
-  # RR adapter
-  def self.silent?
-    @silent ||= class << Bacon; self; end.ancestors.include?(Bacon::TestUnitOutput)
-  end
-  include RR::Adapters::RRMethods
-  RR.trim_backtrace = true
-  alias_method :old_it, :it
-	def it(description)
-    old_it(description) do
-      # Add at least one requirement to ensure mock-only tests don't fail
-      Bacon::Counter[:requirements] += 1
-      yield
-      Bacon::Counter[:requirements] -= 1 if RR.double_injections.size.zero?
-      RR.verify unless self.class.silent?
-      RR.reset
-    end
-	end
 
+  def xtest(*args); end
+  def xcontext(*args); end
   alias_method :test, :it
   alias_method :context, :describe
 end
 
 class <<self
   alias_method :context, :describe
-end
+end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: lightning
 version: !ruby/object:Gem::Version 
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 3
-  - 2
-  version: 0.3.2
+  - 3
+  version: 0.3.3
 platform: ruby
 authors: 
 - Gabriel Horner
@@ -14,11 +15,69 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-13 00:00:00 -04:00
+date: 2011-02-08 00:00:00 -05:00
 default_executable: 
-dependencies: []
-
-description: Lightning is a commandline framework that lets users wrap commands with shell functions that are able to refer to any filesystem path by its basename. To achieve this, a group of paths to be translated are defined with shell globs. These shell globs, known as a lightning _bolt_, are then applied to commands to produce functions. In addition to translating basenames to full paths, lightning _functions_ can autocomplete these basenames, resolve conflicts if they have the same name, leave any non-basename arguments untouched, and autocomplete directories above and below a basename.
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: bacon
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 1
+        - 1
+        - 0
+        version: 1.1.0
+  type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rr
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 0
+        version: "1.0"
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: bacon-bits
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: bacon-rr
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id004
+description: Lightning is a commandline framework that lets users wrap commands with shell functions that are able to refer to any filesystem path by its basename. To achieve this, a group of paths to be translated are defined with shell globs. These shell globs, known as a lightning _bolt_, are then applied to commands to produce functions. In addition to translating basenames to full paths, lightning _functions_ can autocomplete these basenames, resolve conflicts if they have the same name, leave any non-basename arguments untouched, and autocomplete directories above and below a basename. To make bolts shareable between users and functions easier to create, lightning has _generators_. A _generator_ generates filesystem-specific globs for a bolt. Lightning comes with some default generators. Users can make their own generators with generator plugins placed under ~/.lightning/generators/.
 email: gabriel.horner@gmail.com
 executables: 
 - lightning
@@ -27,37 +86,28 @@ executables:
 extensions: []
 
 extra_rdoc_files: 
-- LICENSE.txt
 - README.rdoc
-files: 
-- CHANGELOG.rdoc
 - LICENSE.txt
-- README.rdoc
-- Rakefile
-- bin/lightning
-- bin/lightning-complete
-- bin/lightning-translate
-- lib/lightning.rb
+files: 
 - lib/lightning/bolt.rb
 - lib/lightning/builder.rb
-- lib/lightning/commands.rb
 - lib/lightning/commands/bolt.rb
 - lib/lightning/commands/core.rb
 - lib/lightning/commands/function.rb
 - lib/lightning/commands/shell_command.rb
+- lib/lightning/commands.rb
 - lib/lightning/commands_util.rb
 - lib/lightning/completion.rb
 - lib/lightning/completion_map.rb
 - lib/lightning/config.rb
 - lib/lightning/function.rb
 - lib/lightning/generator.rb
-- lib/lightning/generators.rb
 - lib/lightning/generators/misc.rb
 - lib/lightning/generators/ruby.rb
+- lib/lightning/generators.rb
 - lib/lightning/util.rb
 - lib/lightning/version.rb
-- man/lightning.1
-- man/lightning.1.ronn
+- lib/lightning.rb
 - test/bolt_commands_test.rb
 - test/bolt_test.rb
 - test/builder_test.rb
@@ -69,51 +119,56 @@ files:
 - test/function_commands_test.rb
 - test/function_test.rb
 - test/generator_test.rb
-- test/lightning.yml
 - test/shell_command_commands_test.rb
 - test/test_helper.rb
-has_rdoc: yard
-homepage: http://tagaholic.me/lightning
-licenses: []
-
+- bin/lightning
+- bin/lightning-complete
+- bin/lightning-translate
+- LICENSE.txt
+- CHANGELOG.rdoc
+- README.rdoc
+- test/deps.rip
+- Rakefile
+- .gemspec
+- test/lightning.yml
+- man/lightning.1
+- man/lightning.1.ronn
+has_rdoc: true
+homepage: http://tagaholic.me/lightning/
+licenses: 
+- MIT
 post_install_message: 
 rdoc_options: 
 - --title
-- Lightning 0.3.2 Documentation
+- Lightning 0.3.3 Documentation
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 23
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 6
+      version: 1.3.6
 requirements: []
 
 rubyforge_project: tagaholic
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Lightning is a commandline framework that generates shell functions which wrap around commands to autocomplete and translate full paths by their basenames.
-test_files: 
-- test/bolt_commands_test.rb
-- test/bolt_test.rb
-- test/builder_test.rb
-- test/commands_test.rb
-- test/completion_map_test.rb
-- test/completion_test.rb
-- test/config_test.rb
-- test/core_commands_test.rb
-- test/function_commands_test.rb
-- test/function_test.rb
-- test/generator_test.rb
-- test/shell_command_commands_test.rb
-- test/test_helper.rb
+test_files: []
+