Code changes for code review

alexfalkowski · Apr 1, 2015 · 28a49ea · 28a49ea
1 parent 45efaab
commit 28a49ea
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 14 deletions.
diff --git a/Berksfile b/Berksfile
@@ -6,4 +6,4 @@ cookbook 'postgresql', '~> 3.4.10'
 cookbook 'java', '~> 1.28.0'
 cookbook 'git', '~> 4.1.0'
 cookbook 'mercurial', '~> 2.0.4'
-cookbook 'subversion', '~> 1.3.0'
+cookbook 'subversion', '~> 1.3.0'
diff --git a/README.md b/README.md
@@ -117,13 +117,13 @@ Gives you the ability to create TeamCity server/agent
   <tr>
     <td><tt>['teamcity']['agent']['system_properties']</tt></td>
     <td>String</td>
-    <td>The URI of the TeamCity server.</td>
+    <td>Build Script Properties.</td>
     <td><tt></tt></td>
   </tr>
   <tr>
     <td><tt>['teamcity']['agent']['env_properties']</tt></td>
     <td>String</td>
-    <td>The URI of the TeamCity server.</td>
+    <td>Environment Variables.</td>
     <td><tt></tt></td>
   </tr>
   <tr>

diff --git a/attributes/default.rb b/attributes/default.rb
@@ -37,4 +37,4 @@
   default['teamcity']['agent']['work_dir'] = '../work'
   default['teamcity']['agent']['temp_dir'] = '../temp'
   default['teamcity']['agent']['system_dir'] = '../system'
-end
+end
diff --git a/recipes/agent.rb b/recipes/agent.rb
@@ -18,7 +18,7 @@
 
 case node['platform']
 when 'windows'
-  include_recipe 'chef-teamcity::agent-windows'
+  include_recipe 'chef-teamcity::windows_agent'
 else
-  include_recipe 'chef-teamcity::agent-linux'
-end
+  include_recipe 'chef-teamcity::linux_agent'
+end
diff --git a/recipes/default.rb b/recipes/default.rb
@@ -22,12 +22,11 @@
 
 include_recipe 'java'
 
-case node['platform']
-when 'windows'
-  include_recipe 'git'
-  include_recipe 'mercurial'
-  include_recipe 'subversion'
-else
+include_recipe 'git'
+include_recipe 'mercurial'
+include_recipe 'subversion'
+
+if node['platform'] != 'windows'
   package 'git'
   package 'mercurial'
   package 'subversion'

diff --git a/recipes/agent-linux.rb → recipes/linux_agent.rb b/recipes/agent-linux.rb → recipes/linux_agent.rb
diff --git a/recipes/agent-windows.rb → recipes/windows_agent.rb b/recipes/agent-windows.rb → recipes/windows_agent.rb
diff --git a/templates/default/buildAgent.properties.erb b/templates/default/buildAgent.properties.erb
@@ -28,7 +28,7 @@ systemDir=<%= @system_dir %>
 ## The IP address which will be used by TeamCity server to connect to the build agent.
 ## If not specified, it is detected by build agent automatically,
 ## but if the machine has several network interfaces, automatic detection may fail.
-<% unless @own_address.nil? %>
+<% if @own_address %>
 ownAddress=<%= @own_address %>
 <% end %>