rprogram 0.2.0 → 0.2.1

data/.rspec

@@ -0,0 +1 @@
+--colour --format documentation

data/ChangeLog.md

@@ -1,3 +1,7 @@
+### 0.2.1 / 2010-10-27
+
+* Allow the formatter block passed to {RProgram::Option} to return `nil`.
+
 ### 0.2.0 / 2010-10-03
 
 * Added {RProgram::Nameable::ClassMethods}.

data/Rakefile

@@ -1,43 +1,35 @@
 require 'rubygems'
 require 'rake'
-require './lib/rprogram/version.rb'
 
 begin
-  gem 'jeweler', '~> 1.4.0'
-  require 'jeweler'
+  gem 'ore-tasks', '~> 0.1.2'
+  require 'ore/tasks'
 
-  Jeweler::Tasks.new do |gem|
-    gem.name = 'rprogram'
-    gem.version = RProgram::VERSION
-    gem.summary = %Q{A library for creating wrappers around command-line programs.}
-    gem.description = %Q{RProgram is a library for creating wrappers around command-line programs. RProgram provides a Rubyful interface to programs and all their options or non-options. RProgram can also search for programs installed on a system.}
-    gem.email = 'postmodern.mod3@gmail.com'
-    gem.homepage = 'http://github.com/postmodern/rprogram'
-    gem.authors = ['Postmodern']
-    gem.add_development_dependency 'rspec', '>= 1.3.0'
-    gem.add_development_dependency 'yard', '>= 0.5.3'
-    gem.has_rdoc = 'yard'
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
+  Ore::Tasks.new
+rescue LoadError => e
+  STDERR.puts e.message
+  STDERR.puts "Run `gem install ore-tasks` to install 'ore/tasks'."
 end
 
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs += ['lib', 'spec']
-  spec.spec_files = FileList['spec/**/*_spec.rb']
-  spec.spec_opts = ['--options', '.specopts']
-end
+begin
+  gem 'rspec', '~> 2.0.0'
+  require 'rspec/core/rake_task'
 
-task :spec => :check_dependencies
+  RSpec::Core::RakeTask.new
+rescue LoadError => e
+  task :spec do
+    abort "Please run `gem install rspec` to install RSpec."
+  end
+end
 task :default => :spec
 
 begin
+  gem 'yard', '~> 0.6.0'
   require 'yard'
-  YARD::Rake::YardocTask.new
-rescue LoadError
+
+  YARD::Rake::YardocTask.new  
+rescue LoadError => e
   task :yard do
-    abort "YARD is not available. In order to run yard, you must: gem install yard"
+    abort "Please run `gem install yard` to install YARD."
   end
 end

data/gemspec.yml

@@ -0,0 +1,20 @@
+name: rprogram
+summary: A library for creating wrappers around command-line programs.
+description:
+  RProgram is a library for creating wrappers around command-line programs.
+  RProgram provides a Rubyful interface to programs and all their options
+  or non-options. RProgram can also search for programs installed on a
+  system. files without having to use YAML or define classes named like
+  the file.
+
+license: MIT
+authors: Postmodern
+email: postmodern.mod3@gmail.com
+homepage: http://github.com/postmodern/rprogram
+has_yard: true
+
+development_dependencies:
+  ore: ~> 0.2.0
+  ore-tasks: ~> 0.1.2
+  rspec: ~> 2.0.0
+  yard: ~> 0.6.0

data/lib/rprogram/option.rb

@@ -110,12 +110,15 @@ module RProgram
 
       if @multiple
         return value.inject([]) do |args,value|
-          args + @formatter.call(self,[value])
+          arg = @formatter.call(self,[value])
+
+          args += arg if arg
+          args
         end
       else
         value = [value.join(@separator)] if @separator
 
-        return @formatter.call(self,value)
+        return (@formatter.call(self,value) || [])
       end
     end
 

data/lib/rprogram/version.rb

@@ -1,4 +1,4 @@
 module RProgram
   # Version of RProgram
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

data/rprogram.gemspec

@@ -1,104 +1,10 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
-Gem::Specification.new do |s|
-  s.name = %q{rprogram}
-  s.version = "0.2.0"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Postmodern"]
-  s.date = %q{2010-10-03}
-  s.description = %q{RProgram is a library for creating wrappers around command-line programs. RProgram provides a Rubyful interface to programs and all their options or non-options. RProgram can also search for programs installed on a system.}
-  s.email = %q{postmodern.mod3@gmail.com}
-  s.extra_rdoc_files = [
-    "ChangeLog.md",
-     "LICENSE.txt",
-     "README.md"
-  ]
-  s.files = [
-    ".gitignore",
-     ".specopts",
-     ".yardopts",
-     "ChangeLog.md",
-     "LICENSE.txt",
-     "README.md",
-     "Rakefile",
-     "lib/rprogram.rb",
-     "lib/rprogram/compat.rb",
-     "lib/rprogram/exceptions.rb",
-     "lib/rprogram/exceptions/program_not_found.rb",
-     "lib/rprogram/extensions.rb",
-     "lib/rprogram/nameable.rb",
-     "lib/rprogram/nameable/class_methods.rb",
-     "lib/rprogram/nameable/nameable.rb",
-     "lib/rprogram/non_option.rb",
-     "lib/rprogram/option.rb",
-     "lib/rprogram/option_list.rb",
-     "lib/rprogram/options.rb",
-     "lib/rprogram/options/class_methods.rb",
-     "lib/rprogram/options/options.rb",
-     "lib/rprogram/program.rb",
-     "lib/rprogram/rprogram.rb",
-     "lib/rprogram/task.rb",
-     "lib/rprogram/version.rb",
-     "lib/rprogram/yard.rb",
-     "rprogram.gemspec",
-     "spec/classes/aliased_program.rb",
-     "spec/classes/ls_program.rb",
-     "spec/classes/ls_selinux_task.rb",
-     "spec/classes/ls_task.rb",
-     "spec/classes/named_program.rb",
-     "spec/compat_spec.rb",
-     "spec/nameable_spec.rb",
-     "spec/non_option_spec.rb",
-     "spec/option_examples.rb",
-     "spec/option_list_spec.rb",
-     "spec/option_spec.rb",
-     "spec/program_spec.rb",
-     "spec/rprogram_spec.rb",
-     "spec/spec_helper.rb",
-     "spec/task_spec.rb"
-  ]
-  s.has_rdoc = %q{yard}
-  s.homepage = %q{http://github.com/postmodern/rprogram}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{A library for creating wrappers around command-line programs.}
-  s.test_files = [
-    "spec/classes/ls_program.rb",
-     "spec/classes/named_program.rb",
-     "spec/classes/ls_selinux_task.rb",
-     "spec/classes/aliased_program.rb",
-     "spec/classes/ls_task.rb",
-     "spec/nameable_spec.rb",
-     "spec/program_spec.rb",
-     "spec/rprogram_spec.rb",
-     "spec/option_examples.rb",
-     "spec/non_option_spec.rb",
-     "spec/compat_spec.rb",
-     "spec/option_list_spec.rb",
-     "spec/spec_helper.rb",
-     "spec/option_spec.rb",
-     "spec/task_spec.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec>, [">= 1.3.0"])
-      s.add_development_dependency(%q<yard>, [">= 0.5.3"])
-    else
-      s.add_dependency(%q<rspec>, [">= 1.3.0"])
-      s.add_dependency(%q<yard>, [">= 0.5.3"])
-    end
-  else
-    s.add_dependency(%q<rspec>, [">= 1.3.0"])
-    s.add_dependency(%q<yard>, [">= 0.5.3"])
+begin
+  Ore::Specification.new do |gemspec|
+    # custom logic here
   end
+rescue NameError
+  STDERR.puts "The 'rprogram.gemspec' file requires Ore."
+  STDERR.puts "Run `gem install ore` to install Ore."
 end
-

data/spec/option_spec.rb

@@ -4,6 +4,14 @@ require 'spec_helper'
 require 'option_examples'
 
 describe Option do
+  describe "custom formatting" do
+    it "should allow the format block to return nil" do
+      opt = Option.new(:flag => '-f') { |opt,value| }
+
+      opt.arguments('bla').should == []
+    end
+  end
+
   describe "single flag" do
     before(:all) do
       @option = Option.new(:flag => '-f')

data/spec/spec_helper.rb

@@ -1,6 +1,6 @@
 require 'rubygems'
-gem 'rspec', '>=1.3.0'
-require 'spec'
+gem 'rspec', '~> 2.0.0'
+require 'rspec'
 
 require 'rprogram/version'
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Postmodern
@@ -14,57 +14,85 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-03 00:00:00 -07:00
+date: 2010-10-27 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: ore
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
-        - 1
-        - 3
         - 0
-        version: 1.3.0
+        - 2
+        - 0
+        version: 0.2.0
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: yard
+  name: ore-tasks
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 5
-        - 3
-        version: 0.5.3
+        - 1
+        - 2
+        version: 0.1.2
   type: :development
   version_requirements: *id002
-description: RProgram is a library for creating wrappers around command-line programs. RProgram provides a Rubyful interface to programs and all their options or non-options. RProgram can also search for programs installed on a system.
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 0
+        - 0
+        version: 2.0.0
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: yard
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 6
+        - 0
+        version: 0.6.0
+  type: :development
+  version_requirements: *id004
+description: RProgram is a library for creating wrappers around command-line programs. RProgram provides a Rubyful interface to programs and all their options or non-options. RProgram can also search for programs installed on a system. files without having to use YAML or define classes named like the file.
 email: postmodern.mod3@gmail.com
 executables: []
 
 extensions: []
 
 extra_rdoc_files: 
-- ChangeLog.md
-- LICENSE.txt
 - README.md
 files: 
-- .gitignore
-- .specopts
+- .rspec
 - .yardopts
 - ChangeLog.md
 - LICENSE.txt
 - README.md
 - Rakefile
+- gemspec.yml
 - lib/rprogram.rb
 - lib/rprogram/compat.rb
 - lib/rprogram/exceptions.rb
@@ -102,11 +130,11 @@ files:
 - spec/task_spec.rb
 has_rdoc: yard
 homepage: http://github.com/postmodern/rprogram
-licenses: []
-
+licenses: 
+- MIT
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -127,24 +155,17 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: "0"
 requirements: []
 
-rubyforge_project: 
+rubyforge_project: rprogram
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A library for creating wrappers around command-line programs.
 test_files: 
-- spec/classes/ls_program.rb
-- spec/classes/named_program.rb
-- spec/classes/ls_selinux_task.rb
-- spec/classes/aliased_program.rb
-- spec/classes/ls_task.rb
 - spec/nameable_spec.rb
 - spec/program_spec.rb
 - spec/rprogram_spec.rb
-- spec/option_examples.rb
 - spec/non_option_spec.rb
 - spec/compat_spec.rb
 - spec/option_list_spec.rb
-- spec/spec_helper.rb
 - spec/option_spec.rb
 - spec/task_spec.rb

data/.gitignore

@@ -1,9 +0,0 @@
-doc
-pkg
-tmp/*
-.DS_Store
-.yardoc
-*.db
-*.log
-*.swp
-*~

data/.specopts

@@ -1 +0,0 @@
---colour --format specdoc