lock_jar 0.4.6 → 0.5.0

data/VERSION

@@ -1 +1 @@
-0.4.6
+0.5.0

data/bin/lockjar

@@ -1,44 +1,6 @@
 #!/usr/bin/env ruby
 require 'rubygems'
-require 'commander/import'
 require 'lock_jar'
+require 'lock_jar/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.action do |args, options|
-    options.default :lockfile => 'Jarfile.lock', :scopes => ['compile', 'runtime']
-    puts "Locking #{options.lockfile}"
-    LockJar.install( options.lockfile, options.scopes )
-  end
-end
+include LockJar::CLI

data/lib/lock_jar/cli.rb

@@ -0,0 +1,45 @@
+require 'rubygems'
+require 'commander/import'
+  
+module LockJar::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.action do |args, options|
+      options.default :lockfile => 'Jarfile.lock', :scopes => ['compile', 'runtime']
+      puts "Locking #{options.lockfile}"
+      LockJar.lock( options.lockfile, options.scopes )
+    end
+  end  
+end

data/lib/lock_jar/runtime.rb

@@ -41,6 +41,12 @@ module LockJar
     
     def install( jarfile_lock, scopes = ['compile', 'runtime'], opts = {}, &blk )
       deps = list( jarfile_lock, scopes, opts, &blk )
+      
+      lock_data = read_lockfile( jarfile_lock )
+      lock_data['repositories'].each do |repo|
+          resolver(opts).add_remote_repository( repo )
+      end
+      
       files = resolver(opts).download( deps )
       
       files

data/lock_jar.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "lock_jar"
-  s.version = "0.4.6"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Guymon"]
@@ -27,6 +27,7 @@ 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",
@@ -34,6 +35,7 @@ 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",

data/spec/lock_jar/cli_spec.rb

@@ -0,0 +1,17 @@
+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
+  
+  it "should install" do
+    
+  end
+end

data/spec/lock_jar_spec.rb

@@ -32,7 +32,7 @@ describe LockJar, "#lock" do
             "resolved_dependencies"=>["org.apache.tomcat:servlet-api:jar:6.0.35"]},
          "test"=>{
             "dependencies"=>["spec/pom.xml", "junit:junit:jar:4.10"], 
-            "resolved_dependencies"=>["junit:junit:jar:4.10", "org.hamcrest:hamcrest-core:jar:1.1"]} } } )
+            "resolved_dependencies"=>["org.jboss.unit:jboss-unit:jar:1.2.4", "junit:junit:jar:4.10", "org.hamcrest:hamcrest-core:jar:1.1"]} } } )
   end
   
   it "should not replace dependencies with maps" do

data/spec/pom.xml

@@ -18,6 +18,12 @@ ttp://maven.apache.org/maven-v4_0_0.xsd ">
       <artifactId>modelcitizen</artifactId>
       <version>0.2.2</version>
     </dependency>
+    <dependency>
+			<groupId>org.jboss.unit</groupId>
+			<artifactId>jboss-unit</artifactId>
+			<version>1.2.4</version>
+      <scope>test</scope>
+		</dependency>
 	  <dependency>
 	      <groupId>junit</groupId>
           <artifactId>junit</artifactId>

data/spec/spec_helper.rb

@@ -5,6 +5,13 @@ $:.unshift File.expand_path(File.join('..', File.dirname(__FILE__), 'lib'))
 require 'rubygems'
 require 'rspec'
 require 'lib/lock_jar'
+require 'stringio'
+
+def mock_terminal
+  @input = StringIO.new
+  @output = StringIO.new
+  $terminal = HighLine.new @input, @output
+end
 
 RSpec.configure do |config|
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lock_jar
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -144,6 +144,7 @@ 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
@@ -151,6 +152,7 @@ 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
@@ -173,7 +175,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1691747764608271872
+      hash: -2726763900128420909
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: