lock_jar 0.5.4 → 0.5.5

data/Gemfile

@@ -1,8 +1,7 @@
 source "http://rubygems.org"
 
 gem "naether", "~> 0.8.6"
-gem "highline", "> 1.5.0" 
-gem "commander", "~> 4.0.7" 
+gem "gli", "~> 2.0.0"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/VERSION

@@ -1 +1 @@
-0.5.4
+0.5.5

data/bin/lockjar

@@ -1,6 +1,64 @@
 #!/usr/bin/env ruby
 require 'rubygems'
+require 'gli'
 require 'lock_jar'
-require 'lock_jar/cli'
+require 'lock_jar/version'
 
-include LockJar::CLI
+include  GLI::App
+
+program_desc 'LockJar manages Java Jars for Ruby'
+
+version LockJar::VERSION
+
+desc 'Install Jars from a Jarfile.lock'
+command :install do |c|
+  c.desc 'Path to Jarfile.lock'
+  c.default_value 'Jarfile.lock'
+  c.flag :lockfile
+  
+  c.desc "Scopes to install from Jarfile.lock"
+  c.default_value 'compile, runtime'
+  c.flag :scopes
+  
+  c.action do |global_options,options,args|
+    scopes = options[:scopes].split(',').map{ |scope| scope.strip }
+    puts "Installing Jars from #{options[:lockfile]} for #{scopes.inspect}"
+    LockJar.install( options[:lockfile], scopes )
+  end
+end
+
+desc 'List Jars from a Jarfile.lock'
+command :list do |c|
+  c.desc 'Path to Jarfile.lock'
+  c.default_value 'Jarfile.lock'
+  c.flag :lockfile
+  
+  c.desc "Scopes to install from Jarfile.lock"
+  c.default_value 'compile, runtime'
+  c.flag :scopes
+  
+  c.action do |global_options,options,args|
+    scopes = options[:scopes].split(',').map{ |scope| scope.strip }
+    puts "Listing Jars from #{options[:lockfile]} for #{scopes.inspect}"
+    puts LockJar.list( options[:lockfile], scopes ).inspect
+  end
+end
+
+desc 'Lock Jars in a Jarfile.lock'
+command :lock do |c|
+  c.desc 'Path to Jarfile'
+  c.default_value 'Jarfile'
+  c.flag :jarfile
+  
+  c.desc "Path to Jarfile.lock"
+  c.default_value 'Jarfile.lock'
+  c.flag :lockfile
+  
+  c.action do |global_options,options,args|
+    puts "Locking #{options[:jarfile]} to #{options[:lockfile]}"
+    LockJar.lock( options[:jarfile], { :lockfile => options[:lockfile] } )
+  end
+end
+
+
+exit run(ARGV)

data/lock_jar.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "lock_jar"
-  s.version = "0.5.4"
+  s.version = "0.5.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Guymon"]
@@ -27,7 +27,6 @@ Gem::Specification.new do |s|
     "bin/lockjar",
     "lib/lock_jar.rb",
     "lib/lock_jar/buildr.rb",
-    "lib/lock_jar/cli.rb",
     "lib/lock_jar/dsl.rb",
     "lib/lock_jar/maven.rb",
     "lib/lock_jar/resolver.rb",
@@ -35,7 +34,6 @@ Gem::Specification.new do |s|
     "lib/lock_jar/version.rb",
     "lock_jar.gemspec",
     "spec/Jarfile",
-    "spec/lock_jar/cli_spec.rb",
     "spec/lock_jar/dsl_spec.rb",
     "spec/lock_jar/maven_spec.rb",
     "spec/lock_jar/resolver_spec.rb",
@@ -55,16 +53,14 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<naether>, ["~> 0.8.6"])
-      s.add_runtime_dependency(%q<highline>, ["> 1.5.0"])
-      s.add_runtime_dependency(%q<commander>, ["~> 4.0.7"])
+      s.add_runtime_dependency(%q<gli>, ["~> 2.0.0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.9.0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.1.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_development_dependency(%q<yard>, ["~> 0.8.0"])
     else
       s.add_dependency(%q<naether>, ["~> 0.8.6"])
-      s.add_dependency(%q<highline>, ["> 1.5.0"])
-      s.add_dependency(%q<commander>, ["~> 4.0.7"])
+      s.add_dependency(%q<gli>, ["~> 2.0.0"])
       s.add_dependency(%q<rspec>, ["~> 2.9.0"])
       s.add_dependency(%q<bundler>, ["~> 1.1.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
@@ -72,8 +68,7 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<naether>, ["~> 0.8.6"])
-    s.add_dependency(%q<highline>, ["> 1.5.0"])
-    s.add_dependency(%q<commander>, ["~> 4.0.7"])
+    s.add_dependency(%q<gli>, ["~> 2.0.0"])
     s.add_dependency(%q<rspec>, ["~> 2.9.0"])
     s.add_dependency(%q<bundler>, ["~> 1.1.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lock_jar
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
   prerelease: 
 platform: ruby
 authors:
@@ -28,29 +28,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.8.6
 - !ruby/object:Gem::Dependency
-  name: highline
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>'
-      - !ruby/object:Gem::Version
-        version: 1.5.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>'
-      - !ruby/object:Gem::Version
-        version: 1.5.0
-- !ruby/object:Gem::Dependency
-  name: commander
+  name: gli
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.0.7
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.0.7
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -144,7 +128,6 @@ files:
 - bin/lockjar
 - lib/lock_jar.rb
 - lib/lock_jar/buildr.rb
-- lib/lock_jar/cli.rb
 - lib/lock_jar/dsl.rb
 - lib/lock_jar/maven.rb
 - lib/lock_jar/resolver.rb
@@ -152,7 +135,6 @@ files:
 - lib/lock_jar/version.rb
 - lock_jar.gemspec
 - spec/Jarfile
-- spec/lock_jar/cli_spec.rb
 - spec/lock_jar/dsl_spec.rb
 - spec/lock_jar/maven_spec.rb
 - spec/lock_jar/resolver_spec.rb
@@ -175,7 +157,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 822387068063621992
+      hash: -2534310865284659612
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/lib/lock_jar/cli.rb

@@ -1,50 +0,0 @@
-require 'rubygems'
-require 'commander/import'
-require 'lock_jar'
-require 'lock_jar/version'
-  
-module LockJar
-  module CLI
-
-    # :name is optional, otherwise uses the basename of this executable
-    program :name, 'Lock Jar'
-    program :version, LockJar::VERSION
-    program :description, 'LockJar manages Java Jars for Ruby'
-    
-    command :install do |c|
-      c.syntax = 'lockjar install'
-      c.description = 'Install Jars from a Jarfile.lock'
-      c.option '--lockfile STRING', String, 'Path to Jarfile.lock, defaults to Jarfile.lock'
-      c.option '--scopes ARRAY', Array, "Scopes to install from Jarfile.lock, defaults to 'compile, runtime'"
-      c.action do |args, options|
-        options.default :lockfile => 'Jarfile.lock', :scopes => ['compile', 'runtime']
-        puts "Installing Jars from #{options.lockfile} for #{options.scopes.inspect}"
-        LockJar.install( options.lockfile, options.scopes )
-      end
-    end
-    
-    command :list do |c|
-      c.syntax = 'lockjar list'
-      c.description = 'List Jars from a Jarfile.lock'
-      c.option '--lockfile STRING', String, 'Path to Jarfile.lock, defaults to Jarfile.lock'
-      c.option '--scopes ARRAY', Array, "Scopes to install from Jarfile.lock, defaults to 'compile, runtime'"
-      c.action do |args, options|
-        options.default :lockfile => 'Jarfile.lock', :scopes => ['compile', 'runtime']
-        puts "Listing Jars from #{options.lockfile} for #{options.scopes.inspect}"
-        puts LockJar.list( options.lockfile, options.scopes ).inspect
-      end
-    end
-    
-    command :lock do |c|
-      c.syntax = 'lockjar lock'
-      c.description = 'Lock Jars in a Jarfile'
-      c.option '--jarfile STRING', String, 'Path to Jarfile, defaults to Jarfile'
-      c.option '--lockfile STRING', String, 'Path to Jarfile.lock, defaults to Jarfile.lock'
-      c.action do |args, options|
-        options.default :jarfile => 'Jarfile', :lockfile => 'Jarfile.lock'
-        puts "Locking #{options.jarfile} to #{options.lockfile}"
-        LockJar.lock( options.jarfile, { :lockfile => options.lockfile } )
-      end
-    end  
-  end
-end

data/spec/lock_jar/cli_spec.rb

@@ -1,14 +0,0 @@
-require File.expand_path(File.join(File.dirname(__FILE__),'../spec_helper'))
-require 'lib/lock_jar/cli'
-
-describe LockJar::CLI do
-  before :each do
-    $stderr = StringIO.new
-    mock_terminal
-  end
-  
-  it "should have commands" do
-    LockJar::CLI.commands.keys.should eql( ["help", "install", "list", "lock"] )
-  end
-  
-end