promotion 1.0.9 → 1.1.0

data/CHANGELOG

@@ -1,3 +1,7 @@
+Version 1.1.0::
+    Added dependency on log4r. Fixed several broken dependencies caused
+    by converting to a gem.
+
 Version 1.0.9::
     Minor documentation fixes.
 

data/bin/devolve

@@ -1,13 +1,14 @@
 #!/usr/local/bin/ruby -I/usr/local/
 # This script devolves the database
-
+require 'rubygems'
+require 'promotion'
 require 'getoptlong'
 #______________________
 # Set usage
 #
 usage=<<-EOT
 	devolve - devolve the database schema using migration scripts
-	usage:  sudo /usr/local/bin/devolve [--config configFilepath] appname target
+	usage:  sudo /usr/local/bin/devolve appname target
     where appname is the name of a folder in /var/staging containing a file deploy.xml
 	      target  integer version to devolve to
 EOT
@@ -15,15 +16,12 @@ EOT
 # parse options
 #
 opts = GetoptLong.new(
-  [ "--config",  "-c",            GetoptLong::REQUIRED_ARGUMENT ],
   [ "--help",    "-h",            GetoptLong::NO_ARGUMENT ]
 )
 config = nil
 configFilename = nil
 opts.each do |opt, arg|
 	case opt
-		when "--config"
-			configFilename = arg
 		when "--help"
 			puts usage
 			exit 1
@@ -43,8 +41,6 @@ unless targetVersion >= 1000
 	puts(usage)
 	exit 1
 end
-configFilename ||= "promotion/config.rb"
-require(configFilename)
 unless File.directory?(File.expand_path(appname, Folders::Staging))
 	puts("The application #{appname} was not found in the staging area #{Folders::Staging}")
 	puts("Aborting")
@@ -54,6 +50,5 @@ end
 # start application
 #
 $stdout.flush()
-require 'promotion/application'
 app = Promotion::Application.new(appname)
 app.devolve(targetVersion)

data/bin/evolve

@@ -1,13 +1,14 @@
 #!/usr/local/bin/ruby -I/usr/local/
 # This script evolves the database
-
+require 'rubygems'
+require 'promotion'
 require 'getoptlong'
 #______________________
 # Set usage
 #
 usage=<<-EOT
 	evolve - evolve the database schema using migration scripts
-	usage:  sudo /usr/local/bin/evolve [--config configFilepath] appname [target]
+	usage:  sudo /usr/local/bin/evolve appname [target]
 		where appname is the name of a folder in /var/staging containing a file deploy.xml
 			target is an integer version to evolve to (default is to evolve as far as possible)
 EOT
@@ -15,15 +16,12 @@ EOT
 # parse options
 #
 opts = GetoptLong.new(
-  [ "--config",  "-c",            GetoptLong::REQUIRED_ARGUMENT ],
   [ "--help",    "-h",            GetoptLong::NO_ARGUMENT ]
 )
 config = nil
 configFilename = nil
 opts.each do |opt, arg|
   case opt
-    when "--config"
-        configFilename = arg
     when "--help"
       puts usage
       exit 1
@@ -44,8 +42,7 @@ if ARGV.length > 1
 		exit 1
 	end
 end
-configFilename ||= "promotion/config.rb"
-require(configFilename)
+
 unless File.directory?(File.expand_path(appname, Folders::Staging))
 	puts("The application #{appname} was not found in the staging area #{Folders::Staging}")
 	puts("Aborting")
@@ -55,6 +52,5 @@ end
 # start application
 #
 $stdout.flush()
-require 'promotion/application'
 app = Promotion::Application.new(appname)
 app.evolve(targetVersion)

data/bin/promote

@@ -1,5 +1,5 @@
 #!/usr/local/bin/ruby
-# This script starts the promotion application
+# This script deploys the given application
 
 #______________________
 if Process.euid != 0
@@ -13,23 +13,19 @@ require 'getoptlong'
 #
 usage=<<-EOT
   promotion - installer and configuration manager
-  usage:  sudo /usr/local/bin/promotion [--config configFilepath] appname
+  usage:  sudo /usr/local/sbin/promotion appname
     where appname is the name of a folder under /var/staging
 EOT
 #______________________
 # parse options
 #
 opts = GetoptLong.new(
-  [ "--config",  "-c",            GetoptLong::REQUIRED_ARGUMENT ],
-  [ "--verbose", "-v",            GetoptLong::NO_ARGUMENT ],
   [ "--help",    "-h",            GetoptLong::NO_ARGUMENT ]
 )
 config = nil
 configFilename = nil
 opts.each do |opt, arg|
   case opt
-    when "--config"
-        configFilename = arg
     when "--help"
       puts usage
       exit 1
@@ -38,10 +34,8 @@ end
 #______________________
 # check arguments
 #
-if ARGV.length() == 0
-  puts("No application to install. We will just regenerate the environment files.")
-elsif ARGV.length() > 1
-  puts("Please specify just one application at a time.")
+if ARGV.length() == 0 or ARGV.length() > 1
+  puts("Please specify a single application to deploy.")
   puts(usage)
   exit 1
 end
@@ -52,16 +46,12 @@ unless File.directory?(File.expand_path(appname, "/var/staging"))
   exit 1
 end
 #______________________
-# Configure
-#
-configFilename ||= "promotion/config.rb"
-require(configFilename)
-#______________________
 # start application
 #
+require 'rubygems'
+require 'promotion'
 print("Promoting #{appname}...")
 $stdout.flush()
-require 'promotion/application'
 app = Promotion::Application.new(appname)
 app.promote()
 puts("OK.")

data/lib/promotion/application.rb

@@ -1,4 +1,5 @@
 require 'rubygems'
+require 'promotion/config'
 require 'promotion/enforcer'
 require 'promotion/generator'
 require 'promotion/evolver'

data/lib/promotion/config.rb

@@ -6,8 +6,6 @@ module Folders
 	# The folder where applications are staged (eg. from Subversion)
 	# ready for deployment
 	Staging = "/var/staging"
-	# The folder containing the ERB templates
-	Templates = "/usr/local/promotion/erb"
 	# The system crontab folder
 	Crontabs = "/var/cron/tabs"
 end
@@ -48,8 +46,3 @@ module Templates
 	Crontab = "crontab.erb"
 end
 
-raise "staging area not found" unless File.directory?(Folders::Staging)
-raise "template folder not found" unless File.directory?(Folders::Templates)
-Templates.constants { |template|
-	raise "template #{template} not found" unless File.exist?(File.expand_path(Templates.const_get(template), Folders::Templates))
-}

data/lib/promotion/generator.rb

@@ -12,6 +12,8 @@ module Promotion	# :nodoc:
 # like JAVA_HOME and MYAPP_BASE.
 class Generator
 
+  TEMPLATES = File.expand_path("erb", File.dirname(__FILE__))
+
 	# Returns the XML specification for the selected application
 	attr_accessor :specs
 
@@ -65,7 +67,7 @@ class Generator
 	# Returns the ERB generator
 	def generator_for(sym)
 		begin
-			templateFilename = File.expand_path(Templates.const_get(sym), Folders::Templates)
+			templateFilename = File.expand_path(Templates.const_get(sym), TEMPLATES)
 			raise "Missing template for #{sym}" unless File.exists?(templateFilename)
 			$log.debug("Generating with template #{templateFilename}")
 			templateFile = File.new(templateFilename, File::RDONLY)

data/lib/promotion.rb

@@ -1,3 +1,5 @@
+require 'promotion/application'
+
 # Promotion Module includes:
 # - Promotion::Application
 # - Promotion::Enforcer

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: promotion
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 19
   prerelease: 
   segments: 
   - 1
+  - 1
   - 0
-  - 9
-  version: 1.0.9
+  version: 1.1.0
 platform: ruby
 authors: 
 - Richard Kernahan
@@ -15,9 +15,24 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-19 00:00:00 Z
-dependencies: []
-
+date: 2012-09-20 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: log4r
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 1
+        - 1
+        - 10
+        version: 1.1.10
+  type: :runtime
+  version_requirements: *id001
 description: "\t\tThe Promotion tool is designed to make it easy and quick to deploy an application\n\
   \t\tinto production. Originally built for use with OpenBSD, it can be used on an *nix\n\
   \t\tsystem by adjusting a few paths (in config.rb).\n\n\