astroboa-cli 0.3.1 → 0.4.0

data/README.md

@@ -96,15 +96,16 @@ On **Mac OS X**  to install `rbenv` and `ruby-build` using the [Homebrew](http:/
 	$ brew update
 	$ brew install rbenv
 	$ brew install ruby-build
-
-Then add the following line in your .bash_profile:
 	$ echo 'if which rbenv > /dev/null; then eval "$(rbenv init -)"; fi' >> ~/.bash_profile
 
+The last command adds to your .bash_profile the code that initializes rbenv
+	
+
 
 ---
 On **Ubuntu Linux** to install `rbenv` and `ruby-build` using `apt` package manager and `git` do (it has been tested in Ubuntu 12.04):
 
-	$ sudo apt-get install zlib1g-dev openssl libopenssl-ruby1.9.1 libssl-dev libruby1.9.1 libreadline-dev git-core
+	$ sudo apt-get install build-essential zlib1g-dev openssl libopenssl-ruby1.9.1 libssl-dev libruby1.9.1 libreadline-dev git-core
 	$ cd
 	$ git clone git://github.com/sstephenson/rbenv.git .rbenv
 
@@ -139,9 +140,9 @@ Restart your shell to apply the changes in your bashrc or bash_profile
 
 	$ exec $SHELL
 
-To install ruby version 1.9.3-p194 do:
+To install ruby version 1.9.3-p286 do:
 
-	$ rbenv install 1.9.3-p194
+	$ rbenv install 1.9.3-p286
 	$ rbenv rehash
 
 
@@ -149,22 +150,22 @@ To install ruby version 1.9.3-p194 do:
 
 To set the global version of Ruby to be used in all your shells do:
 	
-	$ rbenv global 1.9.3-p194
+	$ rbenv global 1.9.3-p286
 
-To set ruby 1.9.3-p194 as a local per-project ruby version by writing the version name to an .rbenv-version file in the current project directory do:
+To set ruby 1.9.3-p286 as a local per-project ruby version by writing the version name to an .rbenv-version file in the current project directory do:
 
-	$ rbenv local 1.9.3-p194
+	$ rbenv local 1.9.3-p286
 
-To set ruby 1.9.3-p194 as the version to be used only in the current shell (sets the RBENV_VERSION environment variable in your shell) do:
+To set ruby 1.9.3-p286 as the version to be used only in the current shell (sets the RBENV_VERSION environment variable in your shell) do:
 
-	$ rbenv shell 1.9.3-p194
+	$ rbenv shell 1.9.3-p286
 
 Test your ruby installation:
 
-	$ rbenv global 1.9.3-p194
+	$ rbenv global 1.9.3-p286
 	$ ruby -v
 
-On MAC you will get output similar to this: ruby 1.9.3p194 (2012-04-20 revision 35410) [x86_64-darwin12.0.0]
+On MAC you will get output similar to this: ruby 1.9.3p286 (2012-04-20 revision 35410) [x86_64-darwin12.0.0]
 
 For more information about `rbenv`, `ruby-build` and `rbenv-sudo` check https://github.com/sstephenson/rbenv, https://github.com/sstephenson/ruby-build and https://github.com/dcarley/rbenv-sudo
 
@@ -178,12 +179,12 @@ If you prefer to use 'rvm' as your ruby management utility use the following com
 For multi-user installation and detailed rvm installation instructions check: https://rvm.io/rvm/install/
 To use `sudo` to run astroboa-cli (and any other ruby-based program) you should use `rvmsudo`  
 
-After 'rvm' has been installed run the following commands to install ruby 1.9.3-p194:
+After 'rvm' has been installed run the following commands to install ruby 1.9.3-p286:
 
-	$ rvm install 1.9.3-p194
-	$ rvm use 1.9.3-p194
+	$ rvm install 1.9.3-p286
+	$ rvm use 1.9.3-p286
 	
-run: `$ rvm use 1.9.3-p194 --default` to make 1.9.3-p194 your default ruby
+run: `$ rvm use 1.9.3-p286 --default` to make 1.9.3-p286 your default ruby
 
 # LICENSE
 -------

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

@@ -26,19 +26,31 @@ require 'fileutils'
 #
 class AstroboaCLI::Command::Model < AstroboaCLI::Command::Base
   
-  # model:associate REPOSITORY MODEL_DIR
+  # model:associate REPOSITORY [MODELS_DIR]
   #
   # This command allows you to associate a repository with a domain model.
   # After the association is done your repository can store entities that follow the domain model.
   #
-  # It is recommended to use this command only on new repositories because it does not cope with model updates 
-  # (it will cause instant performace decrease because it resets the whole repository schema and most important 
-  # it may render your data inaccessible if the updated model contain changes to property names or property value cardinality) 
-  # If you change a domain model that has been already associated with a repository use 'astroboa-cli model:propagate_updates'   
+  # It is recommended to use this command either to bootstrap new repositories with a domain model 
+  # or use it with CAUTION to update the domain model of an existing repository.
+  # It is SAFE to use it for domain model updates ONLY WHEN YOU ADD new object types or add new properties to existing types. 
+  # This command does not cope with model updates that change existing object type names or change existing property names, 
+  # property types and property value cardinality. I you do such updates and use this command, it may render your data inaccessible. 
+  # In any case it will not delete any existing data so you can instantly recover your data visibility if you put back your old model.
   #
-  # If you specify the 'MODEL_DIR' (i.e. where your models are stored) then your DSL model definition is expected to be 
-  # in 'MODEL_DIR/dsl' and your XML Schemas to be in 'MODEL_DIR/xsd' 
-  # If you do not specify the 'MODEL_DIR' then domain model is expected to be found inside current directory in 'model/dsl' and 'model/xsd'
+  # The command can be used both when the server is stoppped as well as when the server is up. 
+  # So you can do LIVE UPDATES to your schema but be warned that a schema change 
+  # will cause a few seconds performace decrease on a live system.
+  # 
+  # If in some case you need to change existing object type names or change existing property names, property types 
+  # and property value cardinality in your domain model then use 'astroboa-cli model:propagate_updates' 
+  # in order to propagate the changes to a repository. This might require to alter data 
+  # in the repository as opposed to 'model:associate' that never touches the stored data and 
+  # so it should be used ONLY if you ADD new features to your model.
+  #
+  # If you specify the 'MODELS_DIR' (i.e. where your models are stored) then your DSL model definition is expected to be 
+  # in 'MODELS_DIR/dsl' and your XML Schemas to be in 'MODELS_DIR/xsd' 
+  # If you do not specify the 'MODELS_DIR' then the domain model is expected to be found inside the current directory in 'models/dsl' and 'models/xsd'
   #
   def associate
     
@@ -52,26 +64,26 @@ class AstroboaCLI::Command::Model < AstroboaCLI::Command::Base
     
     error "Repository '#{repository}' does not exist or it is not properly configured (use astroboa-cli repository:list to see available repositories)" unless repository?(server_configuration, repository)
     
-    if model_dir = args.shift
-      model_dir = model_dir.strip
+    if models_dir = args.shift
+      models_dir = models_dir.strip
     else
-      model_dir = File.join(Dir.getwd, 'model')
+      models_dir = File.join(Dir.getwd, 'models')
     end
     
-    error <<-MSG unless Dir.exists? model_dir
-    Directory #{model_dir} does not exist. 
-    If you specify the 'MODEL_DIR' then your DSL model definition is expected to be 
-    in 'MODEL_DIR/dsl' and your XML Schemas to be in 'MODEL_DIR/xsd' 
-    If you do not specify the 'MODEL_DIR' then domain model is expected to be found inside current directory in 'model/dsl' and 'model/xsd'
+    error <<-MSG unless Dir.exists? models_dir
+    Directory #{models_dir} does not exist. 
+    If you specify the 'MODELS_DIR' then your DSL model definition is expected to be 
+    in 'MODELS_DIR/dsl' and your XML Schemas to be in 'MODELS_DIR/xsd' 
+    If you do not specify the 'MODELS_DIR' then domain model is expected to be found inside current directory in 'models/dsl' and 'models/xsd'
     MSG
     
     astroboa_dir = server_configuration['install_dir']
     
     display "Looking for XML Schemas..."
-    xsd_dir = File.join model_dir, 'xsd'
-    model_contains_xsd = Dir.exists?(xsd_dir) && Dir.entries(xsd_dir) != [".", ".."]
+    xsd_dir = File.join models_dir, 'xsd'
+    models_contain_xsds = Dir.exists?(xsd_dir) && Dir.entries(xsd_dir) != [".", ".."]
     
-    if model_contains_xsd
+    if models_contain_xsds
       display "Found XML Schemas in '#{xsd_dir}'"
       display "Validating XML Schemas..."
       
@@ -131,8 +143,244 @@ class AstroboaCLI::Command::Model < AstroboaCLI::Command::Base
     
   end
   
+  # model:create_object_type NAME
+  #
+  # Creates a new object type. The name of the new object type (the class name in programming terms) will be NAME
+  #
+  # It will create a new XML Schema and will add the required definitions (namespaces, imports, xml tags) for the new object type.
+  # The generated file will be named '{NAME}.xsd'
+  # If you do not specify a namespace for your new object type (using --namespace) then the namespace 'http://astroboa/schema/{NAME}' will be used by default
+  #
+  # If you specify the 'MODELS_DIR' (i.e. where your models are stored) then the XML Schema file will be written inside '{MODELS_DIR}/xsd/' ('{MODELS_DIR}/xsd' will be created if it does not exist)
+  # If you do not specify the 'MODELS_DIR' then the XML Schema file will be written in 'models/xsd/' inside the current directory ('./models/xsd' will be created if it does not exist). 
+  #
+  # The created object type will not have any properties. Use the 'model:add_property' command to add properties to your new type.
+  #
+  # NOTE: If you are creating XML Schema files manually besides using this command please follow the same convension 
+  # that this command follows, that is to keep each object type in a separate file and name your file after the name of the type.
+  #
+  # -d, --models_dir MODELS_DIR                 # The directory (absolute path) where your models are stored. # The generated XML Schema file will be written inside '{MODELS_DIR}/xsd/' # If directory {MODELS_DIR}/xsd does not exist, it will be created.
+  # -n, --namespace NAMESPACE                   # The namespace to be used for your new object type # (i.e. the corresponding entity tag will be namespaced with the provided namespace) # If not specified, the default namespace 'http://astroboa/schema/{NAME}' will be used (NAME is the name of your object type).
+  # -l, --localized_labels OBJECT_TYPE_LABELS   # Provide friendly object type names for different languages # By default the 'NAME' of the object type will be used as the english label # Example: -l en:Movie,fr:Film,es:Filme
+  #
+  def create_object_type
+    if object_type = args.shift
+      object_type = object_type.strip
+    else
+      error "Please specify a name for your new object type. Usage: model:create_object_type NAME"
+    end
+     
+    namespace = options[:namespace] ||= "http://astroboa/schema/#{object_type}"
+    models_dir = options[:models_dir] ||= File.join(Dir.getwd, 'models')
+    localized_labels = options[:localized_labels] ||= "en:#{object_type}"
+    localized_labels_map = {}
+    localized_labels.split(',').each {|loc_lab| loc_lab_array = loc_lab.split(':'); localized_labels_map[loc_lab_array[0]] = loc_lab_array[1]}
+    
+    xsd_dir = File.join models_dir, 'xsd'
+    
+    unless Dir.exists? xsd_dir
+      FileUtils.mkdir_p xsd_dir
+    end 
+    
+    schema_file = File.join xsd_dir, "#{object_type}.xsd"
+    
+    error <<-MSG if File.exists? schema_file
+    XML Schema file '#{schema_file}' exists.
+    This means that you have already defined a type named '#{object_type}' (the command creates each object type 
+    in a different schema file named after the object type name).
+    There is also the possibility that you have manually created the file '#{schema_file}'. 
+    If you are creating XML Schema files manually please follow the convension 
+    to keep each object type in a separate file and name your file after the name of the type.
+    MSG
+    
+    # TODO: Extra check all other schemas to verify that user has not manually add this type
+    
+    server_configuration = get_server_configuration
+    astroboa_dir = server_configuration['install_dir']
+    
+    object_type_template = File.join(astroboa_dir, 'astroboa-setup-templates', 'object_type_template.xsd')
+    context = {namespace: namespace, object_type: object_type, localized_labels_map: localized_labels_map}
+    render_template_to_file(object_type_template, context, schema_file)
+    
+    display "Generate schema file '#{schema_file}' for new object type '#{object_type}': OK"
+    display "You can now use 'model:add_property' to add properties to your new object type."
+    display "When you finish adding properties to your type use 'model:associate' to associate a repository with your new object type and start creating object instances of this type" 
+  end
+  
+  
+  # model:add_property PROPERTY_NAME OBJECT_TYPE
+  #
+  # Adds a new property with name 'PROPERTY_NAME' to 'OBJECT_TYPE'. If '--update' is specified it updates an existing property
+  #
+  # If you specify the 'MODELS_DIR' (i.e. where your models are stored) then the XML Schema that contains the object type definition 
+  # is expected to be found in '{MODELS_DIR}/xsd/{OBJECT_TYPE}.xsd' 
+  # If you do not specify the 'MODELS_DIR' then the XML Schema that contains the object type definition is expected to be found inside the current directory in 'models/xsd/{OBJECT_TYPE}.xsd'
+  #
+  # -d, --models_dir MODELS_DIR                 # The directory (absolute path) where your models are stored. # Default is './models' # The XML Schema file that contains the object type definition is expected to be found in '{MODELS_DIR}/xsd/{OBJECT_TYPE}.xsd'
+  # -t, --type TYPE                             # The property type. # Accepted types are: string,integer,double,boolean,date,dateTime,binary,topic_ref,object_ref,complex,[USER_DEFINED_TYPE]. Default type is 'string'.
+  # -x, --max_values MAX_NUM_OF_VALUES          # The maximum number of values that are permitted for this property. # Specify '1' if you want to store only one value. # Specify 'unbounded' if you want to store a list of values without an upper limit in list size. # Default is '1'.
+  # -n, --min_values MIN_NUM_VALUES             # The minimum number of values that are permitted for this property. # Specify '0' to designate a non mandatory field. # Specify '1' to designate a mandatory field. # Default is '0'.
+  # -p, --parent PROPERTY_NAME                  # The name of an EXISTING property that will contain this property. # The parent property should always be of type 'complex'. # Properties of type 'complex' act as a grouping container for their child properties. # Imagine them as named fieldsets of a form # E.g. The 'complex' property 'address' is the parent (container) of the properties 'street', 'city', 'zipcode', 'country'. # You may arbitrarily nest 'complex' properties inside other 'complex' properties to create property trees. 
+  # -l, --localized_labels PROPERTY_NAME_LABELS # Provide friendly names for the property in different languages # By default the 'PROPERTY_NAME' will be used as the english label # Example: -l en:First Name,fr:Prénom,es:Primer Nombre
+  # -u, --update                                # Use this option to specify whether you want to update an EXISTING property. # If the property with 'PROPERTY_NAME' exists and you do not use this option then NO UPDATE will be performed. # The default values for property attributes are not used during a property update. # ONLY the property attributes that are expicitly specified with the options will be updated. # E.g. if you give 'astroboa-cli model:add_property age person -t integer --update' # and the property 'age' exists then only its 'type' will be changed. # The 'minValues', 'maxValues', 'localized_labels' will keep their existing values. 
+  #
+  def add_property
+    if property_name = args.shift
+      property_name = property_name.strip
+    else
+      error "Please specify a name for the property. Usage: model:add_property PROPERTY_NAME OBJECT_TYPE"
+    end
+    
+    if object_type = args.shift
+      object_type = object_type.strip
+    else
+      error "Please specify the object type for which you want to add / update a property. Usage: model:add_property PROPERTY_NAME OBJECT_TYPE"
+    end
+    
+    models_dir = options[:models_dir] ||= File.join(Dir.getwd, 'models')
+    xsd_dir = File.join models_dir, 'xsd'
+    schema_file = File.join xsd_dir, "#{object_type}.xsd"
+    
+    error <<-MSG unless File.exists? schema_file
+    XML Schema file #{schema_file} does not exist.
+    The XML Schema that contains the object type definition 
+    is expected to be found in 'MODELS_DIR/xsd/OBJECT_TYPE.xsd'
+    If you do not specify the MODELS_DIR with '--models_dir MODELS_DIR' 
+    the default is './models'
+    MSG
+    
+    localized_labels = options[:localized_labels] ||= "en:#{property_name}"
+    localized_labels_map = {}
+    localized_labels.split(',').each {|loc_lab| loc_lab_array = loc_lab.split(':'); localized_labels_map[loc_lab_array[0]] = loc_lab_array[1]}
+    
+    type_specified = options.has_key? :type
+    max_values_specified = options.has_key? :max_values
+    min_values_specified = options.has_key? :min_values
+    parent_specified = options.has_key? :parent
+    type = options[:type] ||= 'string'
+    max_values = options[:max_values] ||= '1'
+    min_values = options[:min_values] ||= '0'
+    parent = options[:parent]
+
+    schema = nil
+    File.open(schema_file, 'r') do |f|
+      schema = Nokogiri::XML(f) do |config|
+        config.noblanks
+      end
+    end
+    
+    
+    # find if specified property is already defined
+    property_node_set = schema.xpath "//xs:element[@name='#{property_name}']"
+    if property_node_set.length == 0  # property is not defined
+      # if a parent has been specified check if it exists
+      error <<-MSG if parent && schema.xpath("//xs:element[@name='#{parent}']").length == 0
+      The parent property '#{parent}' you specified does not exist. 
+      Please check the XML Schema at '#{schema_file}' and run the command again with a
+      existing parent property.
+      MSG
+      display "property '#{property_name}' is not yet defined. Lets create it..."
+      property = create_property schema, object_type: object_type, name: property_name, 
+        type: type, min_values: min_values, max_values: max_values, i18n: localized_labels_map
+        
+      write_xml schema, schema_file
+      display <<-MSG
+      Create new property '#{property_name}' for object type '#{object_type}': OK
+      The new property is now defined in file: #{schema_file}
+      The xml schema definition for the new property is: 
+      #{property.to_xml indent: 1, indent_text: "\t", encoding: 'UTF-8'}
+      MSG
+    else
+      display "property '#{property_name}' is already defined. Lets update it..."
+      error "property update is not yet supported"
+    end
+  end
+  
+  
 private
 
+  def create_property schema, options
+    object_type = options[:object_type]
+    property = Nokogiri::XML::Node.new 'element', schema
+    property['name'] = options[:name]
+    property['minOccurs'] = options[:min_values]
+    property['maxOccurs'] = options[:max_values]
+    type = xsd_type options[:type]
+    if type
+      property['type'] = type
+    else # complex properties do not have type but they need some more child tags
+      property = to_complex schema, property
+    end
+    
+    # add localized labels for property name
+    localize schema, property, options[:i18n]
+    
+    # append the new property in XML Schema
+    parent_node = schema.xpath("//xs:element[@name='#{object_type}']//xs:sequence").first
+    error <<-MSG unless parent_node
+    Could not locate the child '<xs:sequence>' tag inside '<xs:element name="#{object_type}"'
+    in order to append the new property.
+    If you have manually created the XML Schema file for object type '#{object_type}'
+    then make sure that you have also created an empty '<xs:sequence></xs:sequence>' child tag 
+    before using this command to add new properties.
+    MSG
+    parent_node << property
+    property
+  end
+  
+  
+  def localize schema, element, localized_labels_map
+    localized_labels_map.each do |locale, label|
+      annotation_node = Nokogiri::XML::Node.new 'annotation', schema
+      documentation_node = Nokogiri::XML::Node.new 'documentation', schema
+      documentation_node["xml:lang"] = locale
+      
+      # here we need to add the astroboa namespace so lets find it in schema
+      astroboa_namespace = schema.root.namespace_definitions.find{|ns| ns.prefix=="astroboa"}
+      error <<-MSG unless astroboa_namespace
+      Could not find the astroboa model namespace using namespace prefix 'astroboa'.
+      If you have manually created the XML Schema make sure that you have specified 
+      (inside the <xml:schema> tag) the astroboa model namespace with the proper prefix as follows:
+        xmlns:astroboa="http://www.betaconceptframework.org/schema/astroboa/model"
+      MSG
+      display_name_node = Nokogiri::XML::Node.new 'displayName', schema
+      display_name_node.namespace = astroboa_namespace
+      display_name_node.content = label
+      
+      documentation_node << display_name_node
+      annotation_node << documentation_node
+      element << annotation_node
+    end
+  end
+  
+  
+  def to_complex schema, property
+    complex_type_node = Nokogiri::Node.new 'xs:complexType', schema
+    sequence_node = Nokogiri::Node.new 'xs:sequence', schema
+    complex_type_node.add_child sequence_node
+    property.add_child complex_type_node
+  end
+  
+  
+  def xsd_type type
+    type = case type
+    when 'string';      'xs:string'
+    when 'integer';     'xs:int'
+    when 'double';      'xs:double'
+    when 'boolean';     'xs:boolean'
+    when 'date';        'xs:date'
+    when 'dateTime';    'xs:dateTime'
+    when 'binary'
+      
+    when 'topic_ref'
+      
+    when 'object_ref';  'astroboa:contentObjectReferenceType'
+    when 'complex';     nil
+    else type
+    end
+  end
+  
+  
   def domain_model_valid? domain_model_file, schemas_dir
     Dir.chdir(schemas_dir) do
 

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

@@ -339,11 +339,8 @@ private
     
     repository << jcrCache
     
-    strip_text_nodes(repo_conf)
     new_astroboa_repos_config = "#{astroboa_repos_config}.new"
-    File.open(new_astroboa_repos_config, 'w') do |f|
-      repo_conf.write_xml_to(f, :indent => 1, :indent_text => "\t", :encoding => 'UTF-8')
-    end
+    write_xml repo_conf, new_astroboa_repos_config
     
     # save old config file
     if conf_exists
@@ -372,11 +369,9 @@ private
       
       if !repo_nodes.empty?
         repo_nodes.remove
-        strip_text_nodes(repo_conf)
+        
         new_astroboa_repos_config = "#{astroboa_repos_config}.new"
-        File.open(new_astroboa_repos_config, 'w') do |f|
-          repo_conf.write_xml_to(f, :indent => 1, :indent_text => "\t", :encoding => 'UTF-8')
-        end
+        write_xml repo_conf, new_astroboa_repos_config
       
         current_date = DateTime.now().strftime('%Y-%m-%dT%H.%M')
         FileUtils.cp astroboa_repos_config, "#{astroboa_repos_config}.#{current_date}"
@@ -392,17 +387,7 @@ private
       error "cannot find repositories configuration file: '#{astroboa_repos_config}'"
     end
   end
-  
-  
-  # remove leading and trailing white space from XML Document text nodes
-  def strip_text_nodes(xml_doc)
-    xml_doc.traverse do |node|
-      if node.text?
-        node.content = node.content.strip
-      end
-    end
-  end
-  
+    
   
   def add_repo_conf_to_server_conf(server_configuration, repository_name)
     repo_domain_name = options[:domain_name] ||= 'localhost:8080'

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

@@ -327,7 +327,7 @@ private
     download_package(@torquebox_version_download_url, @install_dir) unless File.size?(File.join(@install_dir, @torquebox_version_file)) == 6
     
     # download astroboa ear
-    download_package(@astroboa_ear_download_url, @install_dir) unless File.size?(File.join(@install_dir, @astroboa_ear_package)) == 64585240
+    download_package(@astroboa_ear_download_url, @install_dir) unless File.size?(File.join(@install_dir, @astroboa_ear_package)) == 63783475
     
     # download astroboa version file
     download_package(@astroboa_version_download_url, @install_dir) unless File.size?(File.join(@install_dir, @astroboa_version_file)) == 15

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

@@ -1,6 +1,7 @@
 # encoding: UTF-8
 
 require 'astroboa-cli/command/base'
+require 'fileutils'
 require 'rbconfig'
 
 # setup astroboa as a system service (daemon) that automatically starts on boot
@@ -108,8 +109,11 @@ private
       launchd_config_template = File.join(astroboa_dir, 'astroboa-setup-templates', 'AstroboaDaemon.plist.template')
       context = {:astroboa_dir => astroboa_dir, :java_home => ENV['JAVA_HOME'], :jruby_home => File.join(server_configuration['install_dir'], 'torquebox', 'jruby'), :astroboa_user => astroboa_user}
       render_template_to_file(launchd_config_template, context, temp_launchd_config)
-      error "Failed to copy launchd config file to #{LAUNCHD_CONFIG}" unless process_os_command "sudo cp #{temp_launchd_config} #{LAUNCHD_CONFIG}"
-      error "Failed to remove temporary launchd config file #{temp_launchd_config}" unless process_os_command "rm #{temp_launchd_config}"
+      unless FileUtils.cp temp_launchd_config LAUNCHD_CONFIG
+        FileUtils.rm temp_launchd_config
+        error "Failed to copy launchd config file to #{LAUNCHD_CONFIG}"
+      end
+      error "Failed to remove temporary launchd config file #{temp_launchd_config}" unless FileUtils.rm temp_launchd_config
       display "Generating launchd config file '#{LAUNCHD_CONFIG}': OK"
     end
     

data/lib/astroboa-cli/util.rb

@@ -467,20 +467,20 @@ module AstroboaCLI
       database_admin, database_admin_password, database_server = get_postgresql_config(server_configuration)
       begin
         conn = PG.connect(
-          :host     => database_server, 
-          :port     => '5432', 
-          :dbname   => 'postgres', 
-          :user     => database_admin, 
-          :password => database_admin_password)
+          host:     database_server, 
+          port:     '5432', 
+          dbname:   'postgres', 
+          user:     database_admin, 
+          password: database_admin_password)
 
         # check if db exists
         res = conn.exec("SELECT COUNT(*) FROM pg_database WHERE datname=$1",[database_name])
-        unless res.entries[0]['count'] == 0
+        unless res.entries[0]['count'].to_i == 0
           display "Database #{database_name} exists. You may run the command with --db_name repo_db_name to specify a different database name" 
           raise
         end
 
-        res = conn.exec("CREATE DATABASE $1 ENCODING 'UNICODE'", [database_name])
+        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)
         else
@@ -540,6 +540,27 @@ module AstroboaCLI
     end
 
 
+    # remove leading and trailing white space from XML Document text nodes
+    # xml_doc should be a Nokogiri::XML:Document or Nokogiri::XML::Node
+    def strip_text_nodes xml_doc
+      xml_doc.traverse do |node|
+        if node.text?
+          node.content = node.content.strip
+        end
+      end
+    end
+    
+    # write XML document to a file
+    # document should be a Nokogiri::XML:Document or Nokogiri::XML::Node
+    def write_xml document, file_full_path
+      strip_text_nodes document
+
+      File.open(file_full_path, 'w') do |f|
+        document.write_xml_to(f, :indent => 1, :indent_text => "\t", :encoding => 'UTF-8')
+      end
+    end
+    
+    
     # Not used because only works in jruby, TO BE REMOVED
     def create_postgresql_db_with_jdbc(server_configuration, database_name, repo_dir)
       database_admin, database_admin_password, database_server = get_postgresql_config(server_configuration)
@@ -591,5 +612,6 @@ module AstroboaCLI
         raise
       end
     end
+    
   end
 end

data/lib/astroboa-cli/version.rb

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

metadata

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