bonethug 0.0.70 → 0.0.71

data/config/deploy.rb

@@ -176,8 +176,18 @@ task :backup => :environment do
   queue! %[cd #{deploy_to}/current && export to=#{env} && bundle exec astrails-safe .bonethug/backup.rb]
 end
 
-desc "Syncs files to a location"
-task :sync_from => :environment do
+desc "Syncs application state between two remote environments"
+task :sync_remote_from => :environment do
+  queue! %[cd #{deploy_to}/current && bundle exec thug sync-local-from #{env} #{remote_env}]
+end
+
+desc "Syncs application state between two remote environments"
+task :sync_remote_to => :environment do
+  queue! %[cd #{deploy_to}/current && bundle exec thug sync-local-to #{env} #{remote_env}]
+end
+
+desc "Syncs backup with a location"
+task :sync_backup_from => :environment do
   if rsync = conf.get('backup.rsync')
     path = deploy.get('project_slug') + "_" + env + "_sync"
     ssh_pass = rsync.get('pass') ? "sshpass -p #{rsync.get('pass')}" : ""
@@ -192,8 +202,8 @@ task :sync_from => :environment do
   end
 end
 
-desc "Restores files from a location"
-task :sync_to => :environment do
+desc "Restores files from a backup to a location"
+task :sync_backup_to => :environment do
   if rsync = conf.get('backup.rsync')
     path = deploy.get('project_slug') + "_" + env + "_sync"
     ssh_pass = rsync.get('pass') ? "sshpass -p #{rsync.get('pass')}" : ""

data/config/syncer.rb

@@ -8,10 +8,17 @@ require 'bonethug/conf'
 # Config
 # ---------------------------------------------------------------
 
-# load the conf
-conf = Bonethug::Conf.new
+# exec env
+exec_path   = File.expand_path(File.dirname(__FILE__) + '/..')
+env         = ENV['to']
+
+# load config
+conf = Bonethug::Conf.new.add(exec_path + '/config/cnf.yml')
+conf.add(exec_path + '/config/database.yml' => { root: 'dbs.default' }) if File.exist? exec_path + '/config/database.yml'
+
+# extract some data
 cnf  = conf.to_hash
-envs = conf.get 'deploy.environments'
+envs = conf.get('deploy.environments').to_hash
 
 # args
 env_local  = ARGV[1]
@@ -19,21 +26,29 @@ env_remote = ARGV[2]
 type       = ARGV[0]
 
 # validate
+
 unless env_local and env_remote
   puts 'Usage: syncer.rb ' + type + ' [local_environment] [remote_environment]'
   return
 end
 
-# pull config from environment vars
-raise 'could not find deployment environment' unless envs.has_key? env_local and envs.has_key? env_remote
+unless envs.has_key? env_local
+  puts 'could not find local environment'
+  return
+end
+
+unless envs.has_key? env_remote
+  puts 'could not find remote environment'
+  return
+end
 
 # build config
-remote_deploy = conf.node_merge 'deploy.common', 'deploy.environments.' + env_local
+dbs           = conf.get 'dbs'
+remote_deploy = conf.node_merge 'deploy.common', 'deploy.environments.' + env_remote
 local_deploy  = conf.node_merge 'deploy.common', 'deploy.environments.' + env_local
 resources     = conf.get('resources','Array') || []
 log_dirs      = conf.get('log_dirs','Array') || []
-remote_vhost  = deploy.get('project_slug') + '_' + env_remote
-dbs           = conf.get 'dbs'
+remote_vhost  = remote_deploy.get('project_slug') + '_' + env_remote
 
 # directories we need to track
 resources += ['backups']
@@ -49,17 +64,20 @@ remote_ssh  = "ssh -p #{remote_deploy.get 'port'} #{remote_deploy.get 'user'}@#{
 puts "Cloning Databases... "
 
 # output
-dbs.each do |index,db|
+dbs.each do |index, db|
 
   db_remote = db.get env_remote
   db_local  = db.get env_local
 
-  if type == "sync-local-to"
-    system "#{remote_ssh} \"mysqldump -u #{db_remote.get 'user'} -p #{db_remote.get 'pass'} #{db_remote.get 'name'} --verbose | bzip2 -c\" | bunzip2 -c | mysql -u #{db_local.get 'user'} -p #{db_local.get 'pass'} #{db_local.get 'name'}"
-  elsif type == "sync-local-from"
-    system "mysqldump -u #{db_local.get 'user'} -p #{db_local.get 'pass'} #{db_local.get 'name'} --verbose | bzip2 -c | #{remote_ssh} \"bunzip2 -c | mysql -u #{db_remote.get 'user'} -p #{db_remote.get 'pass'} #{db_remote.get 'name'}\""
+  if type == "sync-local-from"
+    cmd = "#{remote_ssh} \"mysqldump -u #{db_remote.get 'user'} -p#{db_remote.get 'pass'} #{db_remote.get 'name'} --verbose | bzip2 -c\" | bunzip2 -c | mysql -u #{db_local.get 'user'} -p#{db_local.get 'pass'} #{db_local.get 'name'}"
+  elsif type == "sync-local-to"
+    cmd = "mysqldump -u #{db_local.get 'user'} -p#{db_local.get 'pass'} #{db_local.get 'name'} --verbose | bzip2 -c | #{remote_ssh} \"bunzip2 -c | mysql -u #{db_remote.get 'user'} -p#{db_remote.get 'pass'} #{db_remote.get 'name'}\""
   end
 
+  puts cmd
+  system cmd
+
 end
 
 puts "Done."
@@ -67,12 +85,17 @@ puts "Syncing Files... "
 
 # sync the files
 (resources + log_dirs).each do |item|
+
   case type
   when "sync-local-from"
-    system "rsync -r -a -v -e \"#{ssh_pass} ssh -l #{rsync.get('user')}\" --delete --copy-dirlinks #{rsync.get('host')}:#{path}/current/#{item} ./"
+    cmd = "rsync -zrav -e \"ssh -p #{remote_deploy.get('port')} -l #{remote_deploy.get('user')}\" --delete --copy-dirlinks #{remote_deploy.get('domain')}:#{remote_path}/current/#{item} #{exec_path}/#{item}"
   when "sync-local-to"
-    system "rsync -r -a -v -e \"#{ssh_pass} ssh -l #{rsync.get('user')}\" --delete --copy-dirlinks ./#{item} #{rsync.get('host')}:#{path}/current/"
+    cmd = "rsync -zrav -e \"ssh -p #{remote_deploy.get('port')} -l #{remote_deploy.get('user')}\" --delete --copy-dirlinks #{exec_path}/#{item} #{remote_deploy.get('domain')}:#{remote_path}/current/#{item}"
   end
+
+  puts cmd
+  system cmd
+
 end
 
 puts "Done."

data/lib/bonethug/cli.rb

@@ -159,11 +159,13 @@ module Bonethug
         end
 
       when  'sync-local-to',
-            'sync-local-from'
+            'sync-local-from',
+            'sync-remote-to',
+            'sync-remote-from'
 
         # args
         env_local  = ARGV[1]
-        env_remote = ARGV[0]
+        env_remote = ARGV[2]
 
         # validate
         unless env_local and env_remote
@@ -171,8 +173,15 @@ module Bonethug
           return
         end
 
-        # run the script
-        exec "ruby .bonethug/syncer.rb #{task} #{env_local} #{env_remote}"
+        # Do Sync
+        case task
+        when 'sync-local-to', 'sync-local-from'
+          exec "ruby .bonethug/syncer.rb #{task} #{env_local} #{env_remote}"
+        when 'sync-remote-to'
+          exec "export to=#{env_local} && export remote_env=#{env_remote} && bundle exec mina -f .bonethug/deploy.rb sync_remote_to --verbose"
+        when 'sync-remote-from'
+          exec "export to=#{env_local} && export remote_env=#{env_remote} && bundle exec mina -f .bonethug/deploy.rb sync_remote_from --verbose"
+        end
 
       when  'deploy',
             'setup',
@@ -214,9 +223,9 @@ module Bonethug
 
         # Synchronised backup
         when 'sync-backup-to'
-          exec "export to=#{environment} && bundle exec mina -f .bonethug/deploy.rb sync_to --verbose"
+          exec "export to=#{environment} && bundle exec mina -f .bonethug/deploy.rb sync_backup_to --verbose"
         when 'sync-backup-from'
-          exec "export to=#{environment} && bundle exec mina -f .bonethug/deploy.rb sync_from --verbose"
+          exec "export to=#{environment} && bundle exec mina -f .bonethug/deploy.rb sync_backup_from --verbose"
 
         end
 

data/lib/bonethug/conf.rb

@@ -1,280 +1,280 @@
-require 'yaml'
-
-module Bonethug
-
-  class Conf
-
-    @@default_paths = {
-      File.expand_path('./config/cnf.yml')      => nil,
-      File.expand_path('./config/database.yml') => {root: 'dbs.default'}
-    }
-    @@fallbacks = {
-      'name' => 'database',
-      'user' => 'username',
-      'pass' => 'password'
-    }
-
-    def initialize(new_hash = nil, options = {})
-      raise "New hash must be of type Hash" if new_hash && new_hash.class.name != 'Hash'
-      @options = {use_fallbacks: true}.merge options
-      @loaded_paths = []
-      @paths = {}
-      @config_hashes = {}
-      @compiled_hash = new_hash ? new_hash : {}
-    end
-
-    def add_path(new_path)
-      if new_path.class.name == 'Hash'
-        path_hash = new_path
-      elsif new_path.class.name == 'String'
-        path_hash = {new_path => nil}
-      else
-        raise "add_path only accepts stings or hashes"
-      end
-      @paths = @paths.merge path_hash
-      self
-    end
-
-    def remove_path(path_to_remove)
-      # deletes an element from a hash if its key can be found
-      @paths.delete path_to_remove
-      self
-    end
-
-    def compile_configuration
-
-      # load the defaults if we haven't loaded anything
-      use_defaults if @paths.empty?
-
-      # generate output
-      out = {}
-      @paths.each do |path,options|
-        
-        # load the file if we haven't already
-        load_path path unless @loaded_paths.include? path
-
-        # create a base fragment
-        fragment_base = {}
-
-        # create the other nodes
-        if options and options.has_key? :root
-          fragment = fragment_base
-          nodes = options[:root].split '.'
-          nodes.each_with_index do |node,i|
-            fragment[node] = i == nodes.length-1 ? @config_hashes[path] : {}
-            fragment = fragment[node]
-          end
-        else
-          fragment_base = @config_hashes[path]
-        end
-
-        # output
-        out = out.merge fragment_base
-
-      end
-      @compiled_hash = out
-      self
-
-    end
-
-    def all_paths_loaded?
-      @paths.each do |path,options|
-        return false unless @loaded_paths.include? path
-      end
-      true
-    end
-
-    def path_ok?(path)
-      path && path.class.name == 'String' and File.exist?(path) and File.file?(path)
-    end  
-
-    def check_path!(path)
-      raise 'config file "' + path.to_s + '" does not exist' unless path_ok? path
-    end
-
-    def check_paths!
-      raise 'No config files have not been set' if @paths.empty?
-      @paths.each do |path,options|
-        check_path! path
-      end
-      self
-    end
-
-    def check_paths
-      @paths.each do |path,options|
-        @paths.delete path unless path_ok? path
-      end
-      self
-    end  
-
-    def load_paths
-      @paths.each do |path,options|
-        load_path path
-      end
-      self
-    end
-
-    def load_path(path)
-      load_path? path
-      self
-    end
-
-    def load_path?(path)
-      return false unless path_ok? path
-      @loaded_paths.push path
-      @config_hashes[path] = YAML.load_file path
-      self
-    end 
-
-    def use_defaults
-      @paths = @@default_paths if @paths.empty?
-      load_paths
-      self
-    end
-
-    def get(node = nil, force_type = nil)
-      node_val = node ? get_compiled_hash_node_handle(node) : self
-      case force_type
-        when 'Array'
-          return [] unless node_val
-          return [node_val] if node_val.class.name == 'String'
-          return node_val.class.name == 'Array' ? node_val.clone : node_val.to_a
-        when 'Hash'
-          return {} unless node_val
-          if node_val.class.name == 'Array'
-            return array2hash node_val
-          elsif node_val.class.name == 'Hash' 
-            return node_val.clone
-          else
-            return node_val.to_hash
-          end
-        else
-          return handle_node_value node_val
-      end
-    end
-
-    def has_key?(key)
-      compiled_hash.has_key? key
-    end  
-
-    def get_compiled_hash_node_handle(node = nil)
-      if node
-        nodes = node.split('.')
-        current = compiled_hash
-        nodes.each do |node|
-          node = @@fallbacks[node] if @options[:use_fallbacks] and !current[node] and @@fallbacks[node]
-          current = (current.class.name == 'Hash' or current.class.name == 'Array') ? current[node] : nil
-        end
-        return current
-      else
-        return self.compiled_hash
-      end
-    end  
-
-    def handle_node_value(node)
-      return node if node.class.name == 'Conf'
-      node = array2hash node if node.class.name == 'Array'
-      return node.class.name == 'Hash' ? self.clone.set_compiled_hash(node) : node
-    end
-
-    def array2hash(arr)
-      return arr if arr.class.name == 'Hash'
-      hsh = {}
-      arr.each_with_index do |item,i|
-        hsh[i] = item
-      end
-      hsh
-    end
-
-    def get_hash(node = nil)
-      get(node).compiled_hash
-    end
-
-    def to_hash
-      compiled_hash.clone
-    end
-
-    def to_a
-      to_hash.to_a
-    end  
-
-    def node_merge!(node1,node2)
-      cnf1 = get_compiled_hash_node_handle node1
-      cnf2 = get_compiled_hash_node_handle node2
-      cnf1.merge!(cnf2) if cnf1 && cnf2
-      return self
-    end
-
-    def node_merge(node1,node2)
-      cnf1 = get_compiled_hash_node_handle node1
-      cnf2 = get_compiled_hash_node_handle node2
-      return handle_node_value cnf1 if cnf1 && !cnf2
-      return handle_node_value cnf1 if cnf2 && !cnf1
-      return handle_node_value cnf1.merge(cnf2) if cnf1 && cnf2
-    end  
-
-    def merge(node)
-      return self unless node
-      return handle_node_value compiled_hash.merge(node.to_hash)
-    end  
-
-    def each
-      compiled_hash.each do |k,v|
-        yield k,handle_node_value(v)
-      end
-    end  
-
-    # Getters and Setters
-    # -------------------
-
-    def paths=(new_paths)
-      raise "paths must be a hash" unless new_hash.class.name == 'Hash'
-      @paths = new_paths
-    end  
-
-    def paths
-      @paths
-    end
-
-    def config_hashes
-      @config_hashes
-    end  
-
-    def compiled_hash
-      compile_configuration if @compiled_hash.empty?
-      @compiled_hash
-    end
-
-    def compiled_hash=(new_hash)
-      raise "compiled hash  must be a hash" unless new_hash.class.name == 'Hash'
-      @compiled_hash = new_hash
-    end
-
-    def set_compiled_hash(new_hash)
-      raise "compiled hash  must be a hash" unless new_hash.class.name == 'Hash'
-      @compiled_hash = new_hash
-      self
-    end  
-
-    # Method Aliases
-    # --------------
-
-    def a2h(arr)
-      array2hash arr
-    end
-
-    def to_hash
-      compiled_hash
-    end
-
-    def add(new_path)
-      add_path new_path
-    end
-
-    def remove(path_to_remove)
-      remove_path path_to_remove
-    end   
-
-  end
-
+require 'yaml'
+
+module Bonethug
+
+  class Conf
+
+    @@default_paths = {
+      File.expand_path('./config/cnf.yml')      => nil,
+      File.expand_path('./config/database.yml') => {root: 'dbs.default'}
+    }
+    @@fallbacks = {
+      'name' => 'database',
+      'user' => 'username',
+      'pass' => 'password'
+    }
+
+    def initialize(new_hash = nil, options = {})
+      raise "New hash must be of type Hash" if new_hash && new_hash.class.name != 'Hash'
+      @options = {use_fallbacks: true}.merge options
+      @loaded_paths = []
+      @paths = {}
+      @config_hashes = {}
+      @compiled_hash = new_hash ? new_hash : {}
+    end
+
+    def add_path(new_path)
+      if new_path.class.name == 'Hash'
+        path_hash = new_path
+      elsif new_path.class.name == 'String'
+        path_hash = {new_path => nil}
+      else
+        raise "add_path only accepts stings or hashes"
+      end
+      @paths = @paths.merge path_hash
+      self
+    end
+
+    def remove_path(path_to_remove)
+      # deletes an element from a hash if its key can be found
+      @paths.delete path_to_remove
+      self
+    end
+
+    def compile_configuration
+
+      # load the defaults if we haven't loaded anything
+      use_defaults if @paths.empty?
+
+      # generate output
+      out = {}
+      @paths.each do |path,options|
+
+        # load the file if we haven't already
+        load_path path unless @loaded_paths.include? path
+
+        # create a base fragment
+        fragment_base = {}
+
+        # create the other nodes
+        if options and options.has_key? :root
+          fragment = fragment_base
+          nodes = options[:root].split '.'
+          nodes.each_with_index do |node,i|
+            fragment[node] = i == nodes.length-1 ? @config_hashes[path] : {}
+            fragment = fragment[node]
+          end
+        else
+          fragment_base = @config_hashes[path]
+        end
+
+        # output
+        out = out.merge fragment_base
+
+      end
+      @compiled_hash = out
+      self
+
+    end
+
+    def all_paths_loaded?
+      @paths.each do |path,options|
+        return false unless @loaded_paths.include? path
+      end
+      true
+    end
+
+    def path_ok?(path)
+      path && path.class.name == 'String' and File.exist?(path) and File.file?(path)
+    end
+
+    def check_path!(path)
+      raise 'config file "' + path.to_s + '" does not exist' unless path_ok? path
+    end
+
+    def check_paths!
+      raise 'No config files have not been set' if @paths.empty?
+      @paths.each do |path,options|
+        check_path! path
+      end
+      self
+    end
+
+    def check_paths
+      @paths.each do |path,options|
+        @paths.delete path unless path_ok? path
+      end
+      self
+    end
+
+    def load_paths
+      @paths.each do |path,options|
+        load_path path
+      end
+      self
+    end
+
+    def load_path(path)
+      load_path? path
+      self
+    end
+
+    def load_path?(path)
+      return false unless path_ok? path
+      @loaded_paths.push path
+      @config_hashes[path] = YAML.load_file path
+      self
+    end
+
+    def use_defaults
+      @paths = @@default_paths if @paths.empty?
+      load_paths
+      self
+    end
+
+    def get(node = nil, force_type = nil)
+      node_val = node ? get_compiled_hash_node_handle(node) : self
+      case force_type
+        when 'Array'
+          return [] unless node_val
+          return [node_val] if node_val.class.name == 'String'
+          return node_val.class.name == 'Array' ? node_val.clone : node_val.to_a
+        when 'Hash'
+          return {} unless node_val
+          if node_val.class.name == 'Array'
+            return array2hash node_val
+          elsif node_val.class.name == 'Hash'
+            return node_val.clone
+          else
+            return node_val.to_hash
+          end
+        else
+          return handle_node_value node_val
+      end
+    end
+
+    def has_key?(key)
+      compiled_hash.has_key? key
+    end
+
+    def get_compiled_hash_node_handle(node = nil)
+      if node
+        nodes = node.split('.')
+        current = compiled_hash
+        nodes.each do |node|
+          node = @@fallbacks[node] if @options[:use_fallbacks] and !current[node] and @@fallbacks[node]
+          current = (current.class.name == 'Hash' or current.class.name == 'Array') ? current[node] : nil
+        end
+        return current
+      else
+        return self.compiled_hash
+      end
+    end
+
+    def handle_node_value(node)
+      return node if node.class.name == 'Conf'
+      node = array2hash node if node.class.name == 'Array'
+      return node.class.name == 'Hash' ? self.clone.set_compiled_hash(node) : node
+    end
+
+    def array2hash(arr)
+      return arr if arr.class.name == 'Hash'
+      hsh = {}
+      arr.each_with_index do |item,i|
+        hsh[i] = item
+      end
+      hsh
+    end
+
+    def get_hash(node = nil)
+      get(node).compiled_hash
+    end
+
+    def to_hash
+      compiled_hash.clone
+    end
+
+    def to_a
+      to_hash.to_a
+    end
+
+    def node_merge!(node1,node2)
+      cnf1 = get_compiled_hash_node_handle node1
+      cnf2 = get_compiled_hash_node_handle node2
+      cnf1.merge!(cnf2) if cnf1 && cnf2
+      return self
+    end
+
+    def node_merge(node1,node2)
+      cnf1 = get_compiled_hash_node_handle node1
+      cnf2 = get_compiled_hash_node_handle node2
+      return handle_node_value cnf1 if cnf1 && !cnf2
+      return handle_node_value cnf1 if cnf2 && !cnf1
+      return handle_node_value cnf1.merge(cnf2) if cnf1 && cnf2
+    end
+
+    def merge(node)
+      return handle_node_value compiled_hash.merge(node.to_hash) if node
+      return self
+    end
+
+    def each
+      compiled_hash.each do |k,v|
+        yield k,handle_node_value(v)
+      end
+    end
+
+    # Getters and Setters
+    # -------------------
+
+    def paths=(new_paths)
+      raise "paths must be a hash" unless new_hash.class.name == 'Hash'
+      @paths = new_paths
+    end
+
+    def paths
+      @paths
+    end
+
+    def config_hashes
+      @config_hashes
+    end
+
+    def compiled_hash
+      compile_configuration if @compiled_hash.empty?
+      @compiled_hash
+    end
+
+    def compiled_hash=(new_hash)
+      raise "compiled hash  must be a hash" unless new_hash.class.name == 'Hash'
+      @compiled_hash = new_hash
+    end
+
+    def set_compiled_hash(new_hash)
+      raise "compiled hash  must be a hash" unless new_hash.class.name == 'Hash'
+      @compiled_hash = new_hash
+      self
+    end
+
+    # Method Aliases
+    # --------------
+
+    def a2h(arr)
+      array2hash arr
+    end
+
+    def to_hash
+      compiled_hash
+    end
+
+    def add(new_path)
+      add_path new_path
+    end
+
+    def remove(path_to_remove)
+      remove_path path_to_remove
+    end
+
+  end
+
 end

data/lib/bonethug/installer.rb

@@ -24,7 +24,7 @@ module Bonethug
     @@bonthug_gem_dir = File.expand_path(File.dirname(__FILE__) + '/../..')
     @@skel_dir = @@bonthug_gem_dir + '/skel'
     @@conf = Conf.new.add(@@skel_dir + '/skel.yml')
-    @@project_config_files = {editable: ['cnf.yml','schedule.rb'], generated: ['backup.rb','deploy.rb']}
+    @@project_config_files = {editable: ['cnf.yml','schedule.rb'], generated: ['syncer.rb','backup.rb','deploy.rb']}
 
     def self.install(type, target = '.')
 
@@ -38,7 +38,7 @@ module Bonethug
 
       # load the configuration
       unless @@conf.get('project_types').has_key? type.to_s
-        puts "Unsupported type: " + type.to_s 
+        puts "Unsupported type: " + type.to_s
         exit
       end
       conf = @@conf.node_merge 'base', 'project_types.' + type
@@ -59,7 +59,7 @@ module Bonethug
 
       # build the file set
       puts 'Building ' + type + ' skeleton...'
-      FileUtils.cp_r @@skel_dir + '/base/.', tmp_dir      
+      FileUtils.cp_r @@skel_dir + '/base/.', tmp_dir
       FileUtils.cp_r @@skel_dir + '/project_types/' + type + '/.', tmp_dir
 
       # build the manifest
@@ -68,8 +68,8 @@ module Bonethug
 
       # modify the manifest root
       manifest_path = tmp_dir + '/.bonethug/manifest'
-      File.open(manifest_path,'w') do |file| 
-        file.puts File.read(manifest_path).gsub(/\.bonethug-tmp/,'') 
+      File.open(manifest_path,'w') do |file|
+        file.puts File.read(manifest_path).gsub(/\.bonethug-tmp/,'')
       end
 
       # clean up the target dir
@@ -86,7 +86,7 @@ module Bonethug
 
       # clean up any exisitng install tmp files
       puts 'Cleaning up temporary files...'
-      FileUtils.rm_rf tmp_dir  
+      FileUtils.rm_rf tmp_dir
 
       puts "Installation Complete"
 
@@ -122,7 +122,7 @@ module Bonethug
           puts 'Removal of the following' + failed.count.to_s + ' files failed'
           puts failed.join("\n")
 
-        end 
+        end
 
       else
         puts 'Nothing to do'
@@ -158,25 +158,25 @@ module Bonethug
         puts "creating: " + db.get('name')
         system Bonethug::Installer.init_mysql_db_script(db, path, admin_user)
 
-      end 
+      end
 
-    end    
+    end
 
 
     # Reads system setup scripts
     # --------------------------
-    
+
     def self.get_setup_script
         @@bonthug_gem_dir + '/scripts/ubuntu_setup.sh'
     end
 
     def self.get_setup_script_content
         File.read self.get_setup_script
-    end     
+    end
 
     def self.get_setup_env_cmds
        self.parse_sh self.get_setup_script_content
-    end    
+    end
 
     def self.parse_sh(content)
         content.split("\n").select { |line| !(line =~ /^[\s\t]+$/ || line =~ /^[\s\t]*#/ || line.strip.length == 0) }
@@ -213,7 +213,7 @@ module Bonethug
     def self.save_project_meta_data(base_dir)
 
       meta_data = {'config_digests' => {}}
-      @@project_config_files[:editable].each do |file| 
+      @@project_config_files[:editable].each do |file|
         meta_data['config_digests']['example/' + file] = self.contents_md5(base_dir + '/config/example/' + file)
       end
       File.open(base_dir + '/.bonethug/data','w') { |file| file.puts meta_data.to_yaml }
@@ -236,20 +236,20 @@ module Bonethug
     # copy cnf.yml + schedule.rb to config/example if possible
     # copy backup.rb and deploy.rb to .bonethug if possible
     # add bonethug to gemfile if required
-    # run bundle install      
+    # run bundle install
 
     # mode == :update
     # copy cnf.yml + schedule.rb to config if possible
-    # force copy cnf.yml + schedule.rb to config/example 
+    # force copy cnf.yml + schedule.rb to config/example
     # force copy backup.rb and deploy.rb to .bonethug
     # add bonethug to gemfile if required
-    # run bundle install 
+    # run bundle install
 
     def self.bonethugise(dir='.', mode=:init)
 
       target = File.expand_path(dir)
-    
-      # run bundle update first      
+
+      # run bundle update first
       system('bundle update bonethug') if mode == :update
 
       # check for the existence of required dirs and create if required
@@ -275,7 +275,7 @@ module Bonethug
             FileUtils.cp src_file, target_file unless File.exist?(target_file)
           elsif mode == :update
             FileUtils.cp src_file, example_file if type == :editable
-            FileUtils.cp src_file, target_file if type == :generated or !File.exist?(target_file)          
+            FileUtils.cp src_file, target_file if type == :generated or !File.exist?(target_file)
           else
             puts "Invalid bonethugise mode"
             exit

data/lib/bonethug/version.rb

@@ -1,6 +1,6 @@
 
         module Bonethug
-          VERSION = "0.0.70"
-          BUILD_DATE = "2014-03-17 10:21:25 +1300"
+          VERSION = "0.0.71"
+          BUILD_DATE = "2014-03-17 12:30:16 +1300"
         end
       

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bonethug
 version: !ruby/object:Gem::Version
-  version: 0.0.70
+  version: 0.0.71
   prerelease: 
 platform: ruby
 authors:
@@ -505,7 +505,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2684865245615476395
+      hash: -3367511845365029782
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -514,7 +514,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2684865245615476395
+      hash: -3367511845365029782
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23