projectdx_pipeline 1.2.0 → 1.2.1

data/VERSION

@@ -1 +1 @@
-1.2.0
+1.2.1

data/lib/projectdx_pipeline/database_configuration_template.rb

@@ -34,7 +34,10 @@ class ProjectdxPipeline::DatabaseConfigurationTemplate
   attr_accessor :database_prefix
 
   # a string that will suffix the name of each database, defaults to the
-  # hostname of the machine on which this code is running
+  # hostname of the machine on which this code is running, but will remove the
+  # "rf-pdx-" prefix and the "(.dyn).renewfund.com" suffix, and it will truncate
+  # the result to be no longer than 63 characters due to PostgreSQL's limitation
+  # on the lenght of database names.
   attr_accessor :client_id
 
   # Instantiates a new configuration template. If a +template_file+ is
@@ -73,7 +76,12 @@ class ProjectdxPipeline::DatabaseConfigurationTemplate
   end
 
   def client_id #:nodoc:
-    @client_id ||= Socket.gethostname.gsub(/\W/, '_')
+    @client_id ||= begin
+                     client_id = Socket.gethostname.gsub(/\W/, '_')
+                     client_id.sub!(/^rf_pdx_/, '')
+                     client_id.sub!(/(_dyn)?_renewfund_com$/, '')
+                     client_id.slice(0..62)
+                   end
   end
 
   def self.read_template(template_file) #:nodoc:

data/projectdx_pipeline.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{projectdx_pipeline}
-  s.version = "1.2.0"
+  s.name = "projectdx_pipeline"
+  s.version = "1.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Renewable Funding"]
-  s.date = %q{2012-02-17}
-  s.description = %q{Common pipeline tasks and libraries to be used for all components of the ProjectDX platform}
-  s.email = %q{devteam@renewfund.com}
+  s.date = "2012-02-28"
+  s.description = "Common pipeline tasks and libraries to be used for all components of the ProjectDX platform"
+  s.email = "devteam@renewfund.com"
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc"
@@ -45,11 +45,11 @@ Gem::Specification.new do |s|
     "spec/file_spec.rb",
     "spec/spec_helper.rb"
   ]
-  s.homepage = %q{http://github.com/projectdx/projectdx_pipeline}
+  s.homepage = "http://github.com/projectdx/projectdx_pipeline"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.5.2}
-  s.summary = %q{Rake tasks for ProjectDX deployment pipeline}
+  s.rubygems_version = "1.8.15"
+  s.summary = "Rake tasks for ProjectDX deployment pipeline"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/spec/database_configuration_template_spec.rb

@@ -90,6 +90,31 @@ describe ProjectdxPipeline::DatabaseConfigurationTemplate do
       template = ProjectdxPipeline::DatabaseConfigurationTemplate.new
       template.client_id.should == 'foo_bar'
     end
+
+    it 'removes the string "rf-pdx-" from front of hostname if present' do
+      Socket.stub!(:gethostname => 'rf-pdx-my-awesome-friggin-machine')
+      template = ProjectdxPipeline::DatabaseConfigurationTemplate.new
+      template.client_id.should == 'my_awesome_friggin_machine'
+    end
+
+    it 'removes the ".renewfund.com" string from the end of the hostname if present' do
+      Socket.stub!(:gethostname => 'machine.renewfund.com')
+      template = ProjectdxPipeline::DatabaseConfigurationTemplate.new
+      template.client_id.should == 'machine'
+    end
+
+    it 'removes the ".dyn.renewfund.com" string from the end of the hostname if present' do
+      Socket.stub!(:gethostname => 'machine.dyn.renewfund.com')
+      template = ProjectdxPipeline::DatabaseConfigurationTemplate.new
+      template.client_id.should == 'machine'
+    end
+
+    it 'does not return a string longer than 63 characters (due to a postgresql limitation)' do
+      name = "rf-pdx-" + (('a'..'z').to_a * 4).join('') + "dyn.renewfund.com"
+      Socket.stub!(:gethostname => name)
+      template = ProjectdxPipeline::DatabaseConfigurationTemplate.new
+      template.client_id.should == (('a'..'z').to_a * 4)[0..62].join('')
+    end
   end
 
   describe '#render_to_file' do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: projectdx_pipeline
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 1
   - 2
-  - 0
-  version: 1.2.0
+  - 1
+  version: 1.2.1
 platform: ruby
 authors: 
 - Renewable Funding
@@ -15,11 +15,9 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-17 00:00:00 -08:00
-default_executable: 
+date: 2012-02-28 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: capistrano
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -31,11 +29,11 @@ dependencies:
         - 9
         - 0
         version: 2.9.0
+  name: capistrano
   prerelease: false
   type: :runtime
   requirement: *id001
 - !ruby/object:Gem::Dependency 
-  name: capistrano-ext
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -47,11 +45,11 @@ dependencies:
         - 2
         - 1
         version: 1.2.1
+  name: capistrano-ext
   prerelease: false
   type: :runtime
   requirement: *id002
 - !ruby/object:Gem::Dependency 
-  name: rspec
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -63,11 +61,11 @@ dependencies:
         - 3
         - 0
         version: 2.3.0
+  name: rspec
   prerelease: false
   type: :development
   requirement: *id003
 - !ruby/object:Gem::Dependency 
-  name: bundler
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -79,11 +77,11 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
+  name: bundler
   prerelease: false
   type: :development
   requirement: *id004
 - !ruby/object:Gem::Dependency 
-  name: jeweler
   version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -95,11 +93,11 @@ dependencies:
         - 6
         - 4
         version: 1.6.4
+  name: jeweler
   prerelease: false
   type: :development
   requirement: *id005
 - !ruby/object:Gem::Dependency 
-  name: rcov
   version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -109,6 +107,7 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  name: rcov
   prerelease: false
   type: :development
   requirement: *id006
@@ -149,7 +148,6 @@ files:
 - spec/database_configuration_template_spec.rb
 - spec/file_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/projectdx/projectdx_pipeline
 licenses: 
 - MIT
@@ -179,7 +177,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Rake tasks for ProjectDX deployment pipeline