astroboa-cli 0.4.0 → 0.4.1

data/bin/astroboa-cli

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-# encoding: UTF-8
+# encoding: utf-8
 
 begin
   require "pathname"

data/lib/astroboa-cli/command/base.rb

@@ -1,4 +1,4 @@
-# encoding: UTF-8
+# encoding: utf-8
 
 # This file contains modifications of work covered by the following copyright and  
 # permission notice:

data/lib/astroboa-cli/command/model.rb

@@ -1,4 +1,4 @@
-# encoding: UTF-8
+# encoding: utf-8
 
 require 'astroboa-cli/command/base'
 require 'nokogiri'

data/lib/astroboa-cli/command/repository.rb

@@ -1,4 +1,4 @@
-# encoding: UTF-8
+# encoding: utf-8
 
 require 'astroboa-cli/command/base'
 require 'fileutils'
@@ -46,19 +46,6 @@ class AstroboaCLI::Command::Repository < AstroboaCLI::Command::Base
   
     server_configuration = get_server_configuration
     
-    # try to load the 'pg' library if repository is backed by postgres 
-    unless server_configuration['database'] == 'derby'
-      error <<-MSG unless gem_available?('pg')
-      You should manually install the 'pg' gem if you want to create repositories backed by postgres
-      astroboa-cli gem does not automatically install 'pg' gem since in some environments (e.g. MAC OS X) this might require 
-      to have a local postgres already installed, which in turn is too much if you do not care about postgres.
-    	In *Ubuntu Linux* run first 'sudo apt-get install libpq-dev' and then run 'gem install pg'.
-    	For MAC OS x read http://deveiate.org/code/pg/README-OS_X_rdoc.html to learn how to install the 'pg' gem.
-      MSG
-      
-      require 'pg'
-    end
-    
     check_repo_existense(server_configuration, repository_name)
     
     database_name = options[:db_name] ||= repository_name

data/lib/astroboa-cli/command/server.rb

@@ -1,4 +1,4 @@
-# encoding: UTF-8
+# encoding: utf-8
 
 require 'astroboa-cli/command/base'
 require 'astroboa-cli/command/repository'
@@ -336,7 +336,7 @@ private
     download_package(@astroboa_setup_templates_download_url, @install_dir) unless File.size?(File.join(@install_dir, @astroboa_setup_templates_package)) == 11030750
     
     # download astroboa schemas
-    download_package(@schemas_download_url, @install_dir) unless File.size?(File.join(@install_dir, @schemas_download_url)) == 28426
+    download_package(@schemas_download_url, @install_dir) unless File.size?(File.join(@install_dir, @schemas_package)) == 28426
   end
   
   

data/lib/astroboa-cli/command/service.rb

@@ -1,4 +1,4 @@
-# encoding: UTF-8
+# encoding: utf-8
 
 require 'astroboa-cli/command/base'
 require 'fileutils'

data/lib/astroboa-cli/util.rb

@@ -463,8 +463,26 @@ module AstroboaCLI
     end
     
     
+    def load_pg_library(server_configuration)
+      # try to load the 'pg' library if repository is backed by postgres 
+      unless server_configuration['database'] == 'derby'
+        error <<-MSG unless gem_available?('pg')
+        You should manually install the 'pg' gem if you want to create repositories backed by postgres
+        astroboa-cli gem does not automatically install 'pg' gem since in some environments (e.g. MAC OS X) this might require 
+        to have a local postgres already installed, which in turn is too much if you do not care about postgres.
+      	In *Ubuntu Linux* run first 'sudo apt-get install libpq-dev' and then run 'gem install pg'.
+      	For MAC OS x read http://deveiate.org/code/pg/README-OS_X_rdoc.html to learn how to install the 'pg' gem.
+        MSG
+
+        require 'pg'
+      end   
+    end
+    
     def create_postgresql_db(server_configuration, database_name)
+      load_pg_library(server_configuration)
+      
       database_admin, database_admin_password, database_server = get_postgresql_config(server_configuration)
+      
       begin
         conn = PG.connect(
           host:     database_server, 
@@ -479,7 +497,9 @@ module AstroboaCLI
           display "Database #{database_name} exists. You may run the command with --db_name repo_db_name to specify a different database name" 
           raise
         end
-
+        
+        display "Check that database #{database_name} does not exist: OK"
+        
         res = conn.exec("CREATE DATABASE #{database_name} ENCODING 'UNICODE'")
         if res.result_status == PG::Result::PGRES_COMMAND_OK
           display %(Create Postges database "#{database_name}" : OK)
@@ -492,9 +512,10 @@ module AstroboaCLI
         display "The error is: #{res.error_message}" 
         display %(The error trace is \n #{e.backtrace.join("\n")})
         raise
-      else
+      rescue
         display %(An error has occured during the creation of postgres database "#{database_name}")
         display %(The error trace is \n #{e.backtrace.join("\n")})
+        raise
       ensure
         conn.finish if conn && !conn.finished?
       end
@@ -502,7 +523,10 @@ module AstroboaCLI
 
 
     def drop_postgresql_db(server_configuration, database_name)
+      load_pg_library(server_configuration)
+      
       database_admin, database_admin_password, database_server = get_postgresql_config(server_configuration)
+      
       begin
         conn = PG.connect(
           :host     => database_server, 
@@ -531,9 +555,10 @@ module AstroboaCLI
         display "The error is: #{res.error_message}" 
         display %(The error trace is \n #{e.backtrace.join("\n")})
         raise
-      else
+      rescue
         display %(An error has occured during the deletion of postgres database "#{database_name}")
         display %(The error trace is \n #{e.backtrace.join("\n")})
+        raise
       ensure
         conn.finish if conn && !conn.finished?
       end

data/lib/astroboa-cli/version.rb

@@ -1,3 +1,3 @@
 module AstroboaCLI
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/lib/astroboa-cli.rb

@@ -1,4 +1,4 @@
-# encoding: UTF-8
+# encoding: utf-8
 
 # Astroboa CLI has been inspired by the design of Heroku client 
 # and contains some adapted code (mainly in the base.rb and command.rb files)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: astroboa-cli
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-05 00:00:00.000000000 Z
+date: 2012-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: progressbar