ucb_deployer 0.1.7 → 0.1.8

data/Rakefile

@@ -3,13 +3,14 @@ require 'rake'
 require 'echoe'
 require 'spec/rake/spectask'
 
-Echoe.new('ucb_deployer', '0.1.7') do |p|
+
+Echoe.new('ucb_deployer', '0.1.8') do |p|
   p.description    = "Tool for deploying (Java/JRuby) war files to tomcat"
   p.url            = "http://ucbrb.rubyforge.org"
   p.author         = "Steven Hansen"
   p.email          = "runner@berkeley.edu"
   p.project        = "ucbrb"
-  p.rdoc_pattern = "README.txt", "lib/**/**"
+  p.rdoc_pattern   = "README.txt", "lib/**/**"
 end
  
 desc "Run RSpec tests"

data/bin/ucb_deploy

@@ -29,16 +29,16 @@ task :configure => [:export] do
 end
 
 desc "Export code into the build directory"
-task :export => [:init] do
+task :export => [:init, :check_version] do
   Rake::Task["display_maintenance_file"].invoke
+  @deployer.version = ENV["VERSION"]
   @deployer.export()
 end
 
-task :init => [:check_usage] do
+task :init => [:check_app] do
   begin
     UcbDeployer.debug_mode = true if ENV["DEBUG"]
     @deployer = UcbDeployer.factory(ENV["APP"].to_sym)
-    @deployer.version = ENV["VERSION"]
   rescue UcbDeployer::ConfigError => e
     $stderr.puts(USAGE)
     $stderr.puts(e.message)    
@@ -46,13 +46,6 @@ task :init => [:check_usage] do
   end
 end
 
-task :check_usage do
-  if !(ENV["APP"] && ENV["VERSION"])
-    $stderr.puts(USAGE)
-    exit(1)
-  end
-end
-
 desc "Remove the maintenance file"
 task :remove_maintenance_file => [:init]  do
   @deployer.remove_maintenance_file()  
@@ -63,5 +56,19 @@ task :display_maintenance_file => [:init]  do
   @deployer.display_maintenance_file()  
 end
 
+task :check_version do
+  if ENV["VERSION"].nil?
+    $stderr.puts(USAGE)
+    exit(1)
+  end
+end
+
+task :check_app do
+  if ENV["APP"].nil?
+    $stderr.puts(USAGE)
+    exit(1)
+  end
+end
+
 
 Rake.application.top_level

data/ucb_deployer.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ucb_deployer}
-  s.version = "0.1.7"
+  s.version = "0.1.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Steven Hansen"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ucb_deployer
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 11
   prerelease: false
   segments: 
   - 0
   - 1
-  - 7
-  version: 0.1.7
+  - 8
+  version: 0.1.8
 platform: ruby
 authors: 
 - Steven Hansen