naether 0.3.2 → 0.3.3

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 (6) hide show
  1. data/VERSION +1 -1
  2. data/jar_dependencies.yml +34 -34
  3. data/lib/naether.rb +34 -5
  4. data/naether-0.3.1.jar +0 -0
  5. data/pom.xml +0 -15
  6. metadata +4 -4
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.3.2
1
+ 0.3.3
data/jar_dependencies.yml CHANGED
@@ -1,36 +1,36 @@
1
1
  ---
2
2
  :dependencies:
3
- - com.jcraft:jsch:jar:0.1.38
4
- - com.ning:async-http-client:jar:1.6.1
5
- - org.apache.xbean:xbean-reflect:jar:3.4
6
- - org.jboss.netty:netty:jar:3.2.4.Final
7
- - com.google.collections:google-collections:jar:1.0
8
- - ch.qos.logback:logback-classic:jar:0.9.24
9
- - ch.qos.logback:logback-core:jar:0.9.24
10
- - org.slf4j:slf4j-api:jar:1.6.1
11
- - org.slf4j:jcl-over-slf4j:jar:1.6.1
12
- - org.slf4j:log4j-over-slf4j:jar:1.6.1
13
- - org.sonatype.aether:aether-api:jar:1.11
14
- - org.sonatype.aether:aether-util:jar:1.11
15
- - org.sonatype.aether:aether-impl:jar:1.11
16
- - org.sonatype.aether:aether-spi:jar:1.11
17
- - org.sonatype.aether:aether-connector-file:jar:1.11
18
- - org.sonatype.aether:aether-connector-asynchttpclient:jar:1.11
19
- - org.sonatype.aether:aether-connector-wagon:jar:1.11
20
- - org.apache.maven:maven-model-v3:jar:2.0
21
- - org.apache.maven:maven-aether-provider:jar:3.0.2
22
- - org.apache.maven:maven-model:jar:3.0.2
23
- - org.apache.maven:maven-model-builder:jar:3.0.2
24
- - org.apache.maven:maven-repository-metadata:jar:3.0.2
25
- - org.apache.maven.wagon:wagon-provider-api:jar:1.0-beta-6
26
- - org.apache.maven.wagon:wagon-ssh-common:jar:1.0-beta-7
27
- - org.apache.maven.wagon:wagon-http-lightweight:jar:1.0-beta-7
28
- - org.apache.maven.wagon:wagon-http-shared:jar:1.0-beta-7
29
- - org.apache.maven.wagon:wagon-ssh:jar:1.0-beta-7
30
- - org.apache.maven.wagon:wagon-file:jar:1.0-beta-7
31
- - org.codehaus.plexus:plexus-utils:jar:1.5.8
32
- - org.codehaus.plexus:plexus-container-default:jar:1.5.5
33
- - org.codehaus.plexus:plexus-classworlds:jar:2.2.2
34
- - org.codehaus.plexus:plexus-component-annotations:jar:1.5.5
35
- - org.codehaus.plexus:plexus-interpolation:jar:1.14
36
- - org.codehaus.plexus:plexus-interactivity-api:jar:1.0-alpha-6
3
+ - com.jcraft:jsch:jar:0.1.38
4
+ - com.ning:async-http-client:jar:1.6.1
5
+ - org.apache.xbean:xbean-reflect:jar:3.4
6
+ - org.jboss.netty:netty:jar:3.2.4.Final
7
+ - com.google.collections:google-collections:jar:1.0
8
+ - ch.qos.logback:logback-classic:jar:0.9.24
9
+ - ch.qos.logback:logback-core:jar:0.9.24
10
+ - org.slf4j:slf4j-api:jar:1.6.1
11
+ - org.slf4j:jcl-over-slf4j:jar:1.6.1
12
+ - org.slf4j:log4j-over-slf4j:jar:1.6.1
13
+ - org.sonatype.aether:aether-api:jar:1.11
14
+ - org.sonatype.aether:aether-util:jar:1.11
15
+ - org.sonatype.aether:aether-impl:jar:1.11
16
+ - org.sonatype.aether:aether-spi:jar:1.11
17
+ - org.sonatype.aether:aether-connector-file:jar:1.11
18
+ - org.sonatype.aether:aether-connector-asynchttpclient:jar:1.11
19
+ - org.sonatype.aether:aether-connector-wagon:jar:1.11
20
+ - org.apache.maven:maven-model-v3:jar:2.0
21
+ - org.apache.maven:maven-aether-provider:jar:3.0.2
22
+ - org.apache.maven:maven-model:jar:3.0.2
23
+ - org.apache.maven:maven-model-builder:jar:3.0.2
24
+ - org.apache.maven:maven-repository-metadata:jar:3.0.2
25
+ - org.apache.maven.wagon:wagon-provider-api:jar:1.0-beta-6
26
+ - org.apache.maven.wagon:wagon-ssh-common:jar:1.0-beta-7
27
+ - org.apache.maven.wagon:wagon-http-lightweight:jar:1.0-beta-7
28
+ - org.apache.maven.wagon:wagon-http-shared:jar:1.0-beta-7
29
+ - org.apache.maven.wagon:wagon-ssh:jar:1.0-beta-7
30
+ - org.apache.maven.wagon:wagon-file:jar:1.0-beta-7
31
+ - org.codehaus.plexus:plexus-utils:jar:1.5.8
32
+ - org.codehaus.plexus:plexus-container-default:jar:1.5.5
33
+ - org.codehaus.plexus:plexus-classworlds:jar:2.2.2
34
+ - org.codehaus.plexus:plexus-component-annotations:jar:1.5.5
35
+ - org.codehaus.plexus:plexus-interpolation:jar:1.14
36
+ - org.codehaus.plexus:plexus-interactivity-api:jar:1.0-alpha-6
data/lib/naether.rb CHANGED
@@ -85,19 +85,48 @@ class Naether
85
85
  end
86
86
 
87
87
  # Add a dependency in the notation: groupId:artifactId:type:version
88
- def add_dependency( notation )
89
- @resolver.addDependency( notation )
88
+ def add_notation_dependency( notation, scope='compile' )
89
+ @resolver.addDependency( notation, scope )
90
+ end
91
+
92
+ # Add a dependency
93
+ def add_dependency( dependency )
94
+ #@resolver.addDependency( dependency )
95
+ if Naether.platform == 'java'
96
+ @resolver.addDependency( dependency )
97
+ else
98
+ @resolver._invoke('addDependency', 'Lorg.sonatype.aether.graph.Dependency;', dependency)
99
+ end
90
100
  end
91
101
 
92
102
  # Set array of dependencies in the notation: groupId:artifactId:type:version
93
103
  def dependencies=(dependencies)
104
+ @resolver.clearDependencies()
94
105
  dependencies.each do |dependent|
95
- add_dependency( dependent )
106
+ # Hash of notation => scope
107
+ if dependent.is_a? Hash
108
+ key = dependent.keys.first
109
+ add_notation_dependency( key, dependent[key] )
110
+
111
+ # String notation with compile scope
112
+ elsif dependent.is_a? String
113
+ add_notation_dependency( dependent, 'compile' )
114
+ else
115
+ add_dependency( dependent )
116
+ end
96
117
  end
97
118
  end
98
119
 
99
120
  # Get dependencies
100
121
  def dependencies()
122
+ if Naether.platform == 'java'
123
+ return @resolver.getDependencies().to_a
124
+ else
125
+ return @resolver.getDependencies().toArray()
126
+ end
127
+ end
128
+
129
+ def dependenciesNotation()
101
130
  if Naether.platform == 'java'
102
131
  return @resolver.getDependenciesNotation().to_a
103
132
  else
@@ -108,7 +137,7 @@ class Naether
108
137
  # Resolve dependencies, finding related additional dependencies
109
138
  def resolve_dependencies( download_artifacts = true )
110
139
  @resolver.resolveDependencies( download_artifacts );
111
- dependencies
140
+ dependenciesNotation
112
141
  end
113
142
 
114
143
  def deploy_artifact( notation, file_path, url, opts = {} )
@@ -145,7 +174,7 @@ class Naether
145
174
  @project_instance = projectClass.new
146
175
  end
147
176
 
148
- @project_instance.setNotation( notation )
177
+ @project_instance.setProjectNotation( notation )
149
178
 
150
179
  dependencies().each do |notation|
151
180
  @project_instance.addDependency( notation )
data/naether-0.3.1.jar CHANGED
Binary file
data/pom.xml CHANGED
@@ -114,21 +114,6 @@
114
114
  <artifactId>wagon-file</artifactId>
115
115
  <version>${wagonVersion}</version>
116
116
  </dependency>
117
-
118
-
119
- <!-- exclude commons logging -->
120
- <dependency>
121
- <groupId>commons-logging</groupId>
122
- <artifactId>commons-logging</artifactId>
123
- <version>1.1.1</version>
124
- <scope>provided</scope>
125
- </dependency>
126
- <dependency>
127
- <groupId>commons-logging</groupId>
128
- <artifactId>commons-logging-api</artifactId>
129
- <version>1.1</version>
130
- <scope>provided</scope>
131
- </dependency>
132
117
 
133
118
  <!-- Test Scope -->
134
119
  <dependency>
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: naether
3
3
  version: !ruby/object:Gem::Version
4
- hash: 23
4
+ hash: 21
5
5
  prerelease: false
6
6
  segments:
7
7
  - 0
8
8
  - 3
9
- - 2
10
- version: 0.3.2
9
+ - 3
10
+ version: 0.3.3
11
11
  platform: ruby
12
12
  authors:
13
13
  - Michael Guymon
@@ -15,7 +15,7 @@ autorequire:
15
15
  bindir: bin
16
16
  cert_chain: []
17
17
 
18
- date: 2011-03-10 00:00:00 -05:00
18
+ date: 2011-03-14 00:00:00 -04:00
19
19
  default_executable:
20
20
  dependencies:
21
21
  - !ruby/object:Gem::Dependency