rename dependency_manager variable to dependencies

caelum · Jul 17, 2012 · 3306068 · 3306068
1 parent 577c5f8
commit 3306068
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 16 deletions.
diff --git a/lib/vraptor-scaffold/generators/app/app_generator.rb b/lib/vraptor-scaffold/generators/app/app_generator.rb
@@ -53,7 +53,7 @@ def initialize(args, opts=[])
     validate
     self.destination_root=(project_path)
     @project_name = project_path.split("/").last
-    @dependency_manager = DependencyManager.new(options).dependencies
+    @dependencies = DependencyManager.new(options).dependencies
   end
 
   def create_root_folder

diff --git a/lib/vraptor-scaffold/generators/app/templates/build.gradle.erb b/lib/vraptor-scaffold/generators/app/templates/build.gradle.erb
@@ -34,24 +34,24 @@ sourceSets {
 sourceSets.main.classesDir = new File('<%= Configuration::WEB_INF %>/classes')
 
 jettyRun.scanIntervalSeconds=3
-jettyRun.contextPath = '/' 
+jettyRun.contextPath = '/'
 [jettyRunWar,jettyStop]*.stopPort = 8081
 [jettyRunWar,jettyStop]*.stopKey = 'stopKey'
 
 dependencies {
-<% @dependency_manager.compile_scope.each do |dependency| -%>
+<% @dependencies.compile_scope.each do |dependency| -%>
     compile group: '<%= dependency.group %>', name: '<%= dependency.name %>', version: '<%= dependency.version %>'<% if dependency.has_exclusions? %>, {<% dependency.exclusions.each do |exclusion| %>
         exclude group: '<%= exclusion.group %>', name: '<%= exclusion.name %>'<% end %>
     }<% end %>
 <% end -%>
 
     //Provided dependencies
-<% @dependency_manager.provided_scope.each do |dependency| -%>
+<% @dependencies.provided_scope.each do |dependency| -%>
     providedCompile group: '<%= dependency.group %>', name: '<%= dependency.name %>', version: '<%= dependency.version %>'
 <% end -%>
 
     //Test dependencies
-<% @dependency_manager.test_scope.each do |dependency| -%>
+<% @dependencies.test_scope.each do |dependency| -%>
     testCompile group: '<%= dependency.group %>', name: '<%= dependency.name %>', version: '<%= dependency.version %>'
 <% end -%>
 }
diff --git a/lib/vraptor-scaffold/generators/app/templates/eclipse/classpath-gae.erb b/lib/vraptor-scaffold/generators/app/templates/eclipse/classpath-gae.erb
@@ -6,7 +6,7 @@
 	<classpathentry kind="src" output="target/test-classes" path="src/test/resources"/>
 	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
 	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
-	<% @dependency_manager.test_scope.each do |dependency| %>
+	<% @dependencies.test_scope.each do |dependency| %>
 	  <classpathentry kind="lib" path="lib/test/<%= "#{dependency.name}-#{dependency.version}.jar" %>"/>
         <% end -%>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>

diff --git a/lib/vraptor-scaffold/generators/app/templates/eclipse/classpath.erb b/lib/vraptor-scaffold/generators/app/templates/eclipse/classpath.erb
@@ -12,7 +12,7 @@
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
 	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
-	<% @dependency_manager.test_scope.each do |dependency| %>
+	<% @dependencies.test_scope.each do |dependency| %>
 	<classpathentry kind="lib" path="lib/test/<%= "#{dependency.name}-#{dependency.version}.jar" %>"/>
   <% end -%>
 </classpath>
diff --git a/lib/vraptor-scaffold/generators/app/templates/ivy.erb b/lib/vraptor-scaffold/generators/app/templates/ivy.erb
@@ -9,15 +9,15 @@
 		<conf name="minify" description="dependencies used to minify js and css" visibility="public" />
 	</configurations>
 
-	<dependencies><% @dependency_manager.compile_scope.each do |dependency| -%>
+	<dependencies><% @dependencies.compile_scope.each do |dependency| -%>
 		<dependency org="<%= dependency.group %>" name="<%= dependency.name %>" rev="<%= dependency.version %>" conf="default"<% if dependency.has_exclusions? %>><% dependency.exclusions.each do |exclusion| %>
 			<exclude org="<%= exclusion.group %>" name="<%= exclusion.name %>" />
 		</dependency><% end %><% else %> /><% end %><% end %>
 
-		<!-- Provided dependencies --><% @dependency_manager.provided_scope.each do |dependency| -%>
+		<!-- Provided dependencies --><% @dependencies.provided_scope.each do |dependency| -%>
 		<dependency org="<%= dependency.group %>" name="<%= dependency.name %>" rev="<%= dependency.version %>" conf="provided->default" /><% end -%>
 
-		<!-- Test dependencies --><% @dependency_manager.test_scope.each do |dependency| -%>
+		<!-- Test dependencies --><% @dependencies.test_scope.each do |dependency| -%>
 		<dependency org="<%= dependency.group %>" name="<%= dependency.name %>" rev="<%= dependency.version %>" conf="test->default" /><% end -%>
 
 		<!-- Jetty dependencies -->

diff --git a/lib/vraptor-scaffold/generators/app/templates/pom.erb b/lib/vraptor-scaffold/generators/app/templates/pom.erb
@@ -76,7 +76,7 @@
 		</plugins>
 	</build>
 
-	<dependencies><% @dependency_manager.compile_scope.each do |dependency| %>
+	<dependencies><% @dependencies.compile_scope.each do |dependency| %>
 		<dependency>
 			<groupId><%= dependency.group %></groupId>
 			<artifactId><%= dependency.name %></artifactId>
@@ -89,15 +89,15 @@
 			</exclusions><% end %>
 		</dependency><% end %>
 
-		<!-- Test dependencies --><% @dependency_manager.test_scope.each do |dependency| %>
+		<!-- Test dependencies --><% @dependencies.test_scope.each do |dependency| %>
 		<dependency>
 			<groupId><%= dependency.group %></groupId>
 			<artifactId><%= dependency.name %></artifactId>
 			<version><%= dependency.version %></version>
 			<scope>test</scope>
 		</dependency><% end %>
 
-		<!-- Provided dependencies --><% @dependency_manager.provided_scope.each do |dependency| %>
+		<!-- Provided dependencies --><% @dependencies.provided_scope.each do |dependency| %>
 		<dependency>
 			<groupId><%= dependency.group %></groupId>
 			<artifactId><%= dependency.name %></artifactId>

diff --git a/spec/vraptor-scaffold/generators/app/templates/build.gradle b/spec/vraptor-scaffold/generators/app/templates/build.gradle
@@ -34,7 +34,7 @@ sourceSets {
 sourceSets.main.classesDir = new File('src/main/webapp/WEB-INF/classes')
 
 jettyRun.scanIntervalSeconds=3
-jettyRun.contextPath = '/' 
+jettyRun.contextPath = '/'
 [jettyRunWar,jettyStop]*.stopPort = 8081
 [jettyRunWar,jettyStop]*.stopKey = 'stopKey'
 

diff --git a/spec/vraptor-scaffold/generators/plugin/expected_configs/build.gradle b/spec/vraptor-scaffold/generators/plugin/expected_configs/build.gradle
@@ -34,7 +34,7 @@ sourceSets {
 sourceSets.main.classesDir = new File('src/main/webapp/WEB-INF/classes')
 
 jettyRun.scanIntervalSeconds=3
-jettyRun.contextPath = '/' 
+jettyRun.contextPath = '/'
 [jettyRunWar,jettyStop]*.stopPort = 8081
 [jettyRunWar,jettyStop]*.stopKey = 'stopKey'
 

diff --git a/spec/vraptor-scaffold/generators/plugin/expected_configs/default_org_build.gradle b/spec/vraptor-scaffold/generators/plugin/expected_configs/default_org_build.gradle
@@ -34,7 +34,7 @@ sourceSets {
 sourceSets.main.classesDir = new File('src/main/webapp/WEB-INF/classes')
 
 jettyRun.scanIntervalSeconds=3
-jettyRun.contextPath = '/' 
+jettyRun.contextPath = '/'
 [jettyRunWar,jettyStop]*.stopPort = 8081
 [jettyRunWar,jettyStop]*.stopKey = 'stopKey'