jbundler 0.5.5 → 0.6.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (29) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile.lock +27 -16
  3. data/Gemfile.lock~ +32 -18
  4. data/bin/jbundle +21 -31
  5. data/lib/jbundler.jar +0 -0
  6. data/lib/jbundler.rb +54 -46
  7. data/lib/jbundler/aether.rb +1 -1
  8. data/lib/jbundler/classpath_file.rb +39 -10
  9. data/lib/jbundler/cli.rb +75 -49
  10. data/lib/jbundler/config.rb +84 -33
  11. data/lib/jbundler/configurator.rb +1 -0
  12. data/lib/jbundler/context.rb +34 -0
  13. data/lib/jbundler/{lock_down_pom.rb → dependency_pom.rb} +12 -8
  14. data/lib/jbundler/executable_pom.rb +6 -13
  15. data/lib/jbundler/gemfile_lock.rb +4 -0
  16. data/lib/jbundler/jruby_complete.rb +44 -0
  17. data/lib/jbundler/jruby_complete_pom.rb +31 -0
  18. data/lib/jbundler/lock_down.rb +101 -68
  19. data/lib/jbundler/pom.rb +66 -43
  20. data/lib/jbundler/pom_runner.rb +71 -0
  21. data/lib/jbundler/show.rb +31 -21
  22. data/lib/jbundler/tree.rb +8 -4
  23. data/lib/jbundler/vendor.rb +19 -10
  24. data/spec/classpath_file_spec.rb +47 -3
  25. data/spec/config_spec.rb +70 -43
  26. data/spec/setup.rb +4 -0
  27. data/spec/vendor_spec.rb +3 -3
  28. metadata +25 -8
  29. data/lib/jbundler/tree_pom.rb +0 -19
data/spec/setup.rb CHANGED
@@ -10,3 +10,7 @@ begin
10
10
  rescue LoadError
11
11
  end
12
12
  require 'minitest/autorun'
13
+
14
+ # supress warnings
15
+ require 'stringio'
16
+ $stderr = StringIO.new
data/spec/vendor_spec.rb CHANGED
@@ -31,13 +31,13 @@ describe JBundler::Vendor do
31
31
 
32
32
  it 'is not vendored' do
33
33
  subject.vendored?.must_equal false
34
- subject.require_jars.size.must_equal 0
34
+ subject.require_jars.must_equal true
35
35
  FileUtils.rm_rf( vdir )
36
36
  subject.vendored?.must_equal false
37
37
  end
38
38
 
39
39
  it 'should copy jars on setup and delete them on clear' do
40
- ::JBUNDLER_CLASSPATH.replace Dir[ File.join( workdir, "*.jar" )]
40
+ ::JBUNDLER_CLASSPATH = Dir[ File.join( workdir, "*.jar" )]
41
41
  def cp.require_classpath
42
42
  [ '1.jar', '2.jar' ]
43
43
  end
@@ -51,7 +51,7 @@ describe JBundler::Vendor do
51
51
 
52
52
  subject.vendored?.must_equal true
53
53
 
54
- subject.require_jars.size.must_equal 2
54
+ subject.require_jars.must_equal true
55
55
 
56
56
  subject.clear
57
57
  Dir[ File.join( vdir, '*' ) ].must_equal []
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: jbundler
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.5.5
4
+ version: 0.6.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Christian Meier
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-01-23 00:00:00.000000000 Z
11
+ date: 2014-06-30 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: ruby-maven
@@ -16,7 +16,7 @@ dependencies:
16
16
  requirements:
17
17
  - - '>='
18
18
  - !ruby/object:Gem::Version
19
- version: 3.1.1.0.1
19
+ version: 3.1.1.0.6
20
20
  - - <
21
21
  - !ruby/object:Gem::Version
22
22
  version: 3.1.2
@@ -24,7 +24,7 @@ dependencies:
24
24
  requirements:
25
25
  - - '>='
26
26
  - !ruby/object:Gem::Version
27
- version: 3.1.1.0.1
27
+ version: 3.1.1.0.6
28
28
  - - <
29
29
  - !ruby/object:Gem::Version
30
30
  version: 3.1.2
@@ -44,6 +44,20 @@ dependencies:
44
44
  version: '1.5'
45
45
  prerelease: false
46
46
  type: :runtime
47
+ - !ruby/object:Gem::Dependency
48
+ name: jar-dependencies
49
+ version_requirements: !ruby/object:Gem::Requirement
50
+ requirements:
51
+ - - ~>
52
+ - !ruby/object:Gem::Version
53
+ version: 0.0.4
54
+ requirement: !ruby/object:Gem::Requirement
55
+ requirements:
56
+ - - ~>
57
+ - !ruby/object:Gem::Version
58
+ version: 0.0.4
59
+ prerelease: false
60
+ type: :runtime
47
61
  - !ruby/object:Gem::Dependency
48
62
  name: rake
49
63
  version_requirements: !ruby/object:Gem::Requirement
@@ -78,12 +92,12 @@ dependencies:
78
92
  requirements:
79
93
  - - ~>
80
94
  - !ruby/object:Gem::Version
81
- version: '4.0'
95
+ version: '5.3'
82
96
  requirement: !ruby/object:Gem::Requirement
83
97
  requirements:
84
98
  - - ~>
85
99
  - !ruby/object:Gem::Version
86
- version: '4.0'
100
+ version: '5.3'
87
101
  prerelease: false
88
102
  type: :development
89
103
  description: |
@@ -99,19 +113,22 @@ files:
99
113
  - lib/jbundler.rb
100
114
  - lib/jbundler/aether.rb
101
115
  - lib/jbundler/classpath_file.rb
102
- - lib/jbundler/tree_pom.rb
103
116
  - lib/jbundler/tree.rb
104
- - lib/jbundler/lock_down_pom.rb
105
117
  - lib/jbundler/gemfile_lock.rb
106
118
  - lib/jbundler/executable_pom.rb
119
+ - lib/jbundler/pom_runner.rb
107
120
  - lib/jbundler/lock_down.rb
121
+ - lib/jbundler/context.rb
122
+ - lib/jbundler/dependency_pom.rb
108
123
  - lib/jbundler/configurator.rb
109
124
  - lib/jbundler/cli.rb
110
125
  - lib/jbundler/config.rb
111
126
  - lib/jbundler/pom.rb
127
+ - lib/jbundler/jruby_complete.rb
112
128
  - lib/jbundler/lazy.rb
113
129
  - lib/jbundler/executable.rb
114
130
  - lib/jbundler/vendor.rb
131
+ - lib/jbundler/jruby_complete_pom.rb
115
132
  - lib/jbundler/show.rb
116
133
  - lib/jbundler.jar
117
134
  - spec/config_spec.rb
data/lib/jbundler/tree_pom.rb DELETED
@@ -1,19 +0,0 @@
1
- jfile = java.lang.System.getProperty( "jbundler.jarfile" )
2
- gfile = java.lang.System.getProperty( "jbundler.gemfile" )
3
- jworkdir = java.lang.System.getProperty( "jbundler.workdir" )
4
-
5
- basedir( File.dirname( jfile ) )
6
-
7
- gemfile( gfile ) if File.exists? gfile
8
-
9
- jarfile( jfile, :skip_locked => true )
10
-
11
- build do
12
- directory = jworkdir
13
- default_goal 'dependency:tree'
14
- end
15
-
16
- properties( 'project.build.sourceEncoding' => 'utf-8',
17
- 'tesla.dump.readOnly' => true,
18
- 'tesla.dump.pom' => 'tree.pom.xml',
19
- 'outputFile' => "#{jworkdir}/tree.txt" )