use ssd's more elegant method to compute tomcat.base at compile-time

rather than run-time

ivy/providers/default.rb

@@ -18,24 +18,11 @@
 # limitations under the License.
 #
 
-def resolve_dest(resource)
-  # use a glob because file can have different extensions
-  file_glob = "#{resource.artifactId}-#{resource.version}\.*"
-  if resource.dest_attr
-    dest_attrs = resource.dest_attr.split(':')
-    subdirectory = dest_attrs[-1].match('/') ? dest_attrs.pop : ""
-    node_attr = eval( "node['#{self.cookbook_name}']" +
-                      dest_attrs.map{ |attr| "['" + attr + "']" }.join('') )
-    dest = "#{node_attr}/#{subdirectory}"
-  else
-    dest = "#{resource.dest}"
-  end
-  "#{dest}/#{file_glob}"
-end
-
 action :install do
-  full_name = [ new_resource.groupId, new_resource.artifactId, new_resource.version ].join(' ')  
-  dest = resolve_dest new_resource
+  full_name = [ new_resource.groupId, new_resource.artifactId, new_resource.version ].join(' ')
+  # use a glob because file can have different extensions
+  file_glob = "#{new_resource.artifactId}-#{new_resource.version}\.*"
+  dest = new_resource.dest
   Chef::Log.debug("dest is #{dest}")
   dest_pattern = "#{dest}/[artifact]-[revision].[ext]"
   full_command = %Q{#{node['ivy']['command']} -dependency #{full_name} -retrieve #{dest_pattern} }
@@ -46,6 +33,6 @@ def resolve_dest(resource)
     chown #{new_resource.owner}:#{new_resource.owner} #{dest}
     chmod #{new_resource.mode.to_s} #{dest}
     EOH
-    only_if { Dir.glob("#{dest}\.*").empty? }
+    only_if { Dir.glob("#{dest}/#{file_glob}").empty? }
   end
 end

jira/recipes/default.rb

@@ -22,7 +22,6 @@
 include_recipe "ark"
 include_recipe "tomcat::base"
 include_recipe "ivy"
-base = "/tmp/"
 
 t = tomcat "jira" do
   user node['jira']['user']
@@ -33,7 +32,7 @@
 ivy "mysql-connector-java" do
   groupId "mysql"
   version "5.1.18"
-  dest_attr  ":tomcat:base:/lib"
+  dest  "#{t.base}/lib"
 end
 
 # ark "jira_war" do

pgbouncer/attributes/default.rb

@@ -23,7 +23,7 @@
 
 
 # Where to wait for clients 
-default[:pgbouncer][:listen_addr] = "#{node.network.interfaces.eth0.addresses.current_automatic.keys[0]}"
+default[:pgbouncer][:listen_addr] = "*"
 default[:pgbouncer][:listen_port] = "6432"
 
 # Authentication settings

tomcat/providers/default.rb

@@ -29,14 +29,9 @@ def get_distro
 def get_resource_hash(resource)
   require 'pathname'
   resource_h = Hash.new
-  catalina_parent = Pathname.new(node['tomcat']['home']).parent.to_s
   resource_h['name'] = resource.name
   resource_h['home'] = node['tomcat']['home']
-  resource_h['base'] = "#{catalina_parent}/#{resource_h['name']}"
-  new_resource.base = resource_h['base']
-  Chef::Log.debug("cookbook_name is #{self.cookbook_name}")
-  node[self.cookbook_name]['tomcat'] = {}
-  node[self.cookbook_name]['tomcat']['base'] = resource_h['base']
+  resource_h['base'] = resource.base
   resource_h['context_dir'] = "#{resource_h['base']}/conf/Catalina/localhost"
   resource_h['log_dir'] = "#{resource_h['base']}/logs"
   resource_h['tmp_dir'] = "#{resource_h['base']}/temp"
@@ -140,7 +135,6 @@ def get_resource_hash(resource)
                                    ])
   end
   s.run_action( :enable )
-  #s.run_action( :start )
 
   new_resource.updated_by_last_action(true)
 end

tomcat/resources/default.rb

@@ -42,8 +42,12 @@
 
 # we have to set default for the supports attribute
 # in initializer since it is a 'reserved' attribute name
-def initialize(*args)
+def initialize(*args)s
+  require 'pathname'
   super
   @action = :install
+  catalina_parent = Pathname.new(node['tomcat']['home']).parent.to_s
+  @base = "#{catalina_parent}/#{@name}"
+  Chef::Log.debug("base_is #{@base}")
   @supports = {:report => true, :exception => true}
 end