bonethug 0.0.7 → 0.0.10

data/Gemfile

@@ -1,10 +1,36 @@
+require 'rbconfig'
+
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in bonethug.gemspec
 gemspec
 
 # tell bundler to get stuff from git hub
-gem 'mina',           github: 'nadarei/mina'
-gem 'astrails-safe',  github: 'astrails/safe'
-gem 'whenever',       github: 'javan/whenever'
-gem 'sprockets',      github: 'sstephenson/sprockets'
+gem 'mina',             github: 'nadarei/mina'
+gem 'astrails-safe',    github: 'astrails/safe'
+gem 'whenever',         github: 'javan/whenever'
+
+# gem 'sass',             github: 'nex3/sass'
+# gem 'coffee-script',    github: 'jashkenas/coffee-script'
+
+gem 'guard-sprockets',  github: 'dormi/guard-sprockets' 
+gem 'uglifier'
+
+# gem 'less'
+# gem 'sass-rails'
+# gem 'execjs'
+
+if RbConfig::CONFIG['target_os'] =~ /mswin|mingw/i
+  gem 'wdm', '>= 0.1.0'
+end
+
+# if RUBY_PLATFORM.downcase.include?('linux')
+#   gem 'therubyracer' 
+#   gem 'rb-inotify'
+# end
+
+# if RUBY_PLATFORM.downcase.include?('darwin')
+#   gem 'rb-fsevent'
+#   gem 'terminal-notifier-guard'
+#   gem 'growl'
+# end

data/bonethug.gemspec

@@ -2,6 +2,8 @@
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'bonethug/version'
+require 'rbconfig'
+
 
 Gem::Specification.new do |spec|
 
@@ -25,6 +27,12 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'mina'
   spec.add_dependency 'astrails-safe'
   spec.add_dependency 'whenever' 
-  spec.add_dependency 'sprockets'  
+  # spec.add_dependency 'sass'
+  # spec.add_dependency 'coffee-script'
+  spec.add_dependency 'guard-sprockets'
+
+  if RbConfig::CONFIG['target_os'] =~ /mswin|mingw/i
+    spec.add_dependency 'wdm', '>= 0.1.0'
+  end
 
 end

data/{skel/base/config/example → config}/backup.rb

@@ -2,6 +2,12 @@
 # bundle exec astrails-safe CONFIG_FILE
 # more info: https://github.com/astrails/safe
 
+# require some shit
+# --------------------------------
+
+require 'rubygems'
+require 'bonethug/conf'
+
 # Load some data
 # --------------------------------
 
@@ -10,8 +16,7 @@ exec_path   = File.expand_path(File.dirname(__FILE__))
 env         = ENV['to']
 
 # load config
-require exec_path + '/lib/conf'
-conf = Conf.new.add(exec_path + '/config/cnf.yml').add(exec_path + '/config/database.yml' => { root: 'dbs.default' })
+conf = Bonethug::Conf.new.add(exec_path + '/config/cnf.yml').add(exec_path + '/config/database.yml' => { root: 'dbs.default' })
 
 # do a check
 raise 'could not find deployment environment' unless conf.get('deploy.environments').has_key? env

data/{skel/base/config/example → config}/cnf.yml

@@ -119,5 +119,16 @@ chgrp:
 resources:
   - public/assets
   - public/uploads
+watch:
+  sass:
+    -
+      src: public/assets/scss
+      dest: public/assets/css
+      filter:
+  coffee:
+    -
+      src: public/assets/coffee
+      dest: public/assets/js
+      filter: 
 log_dirs:
   - log

data/{skel/base/config/example → config}/deploy.rb

@@ -6,8 +6,8 @@
 
 # Requires
 # ---------------------------------------------------------------
-
-require File.join(File.dirname(__FILE__), '..', 'lib', 'conf')
+require 'rubygems'
+require 'bonethug/conf'
 require 'mina/bundler'
 require 'mina/rails'
 require 'mina/git'
@@ -18,7 +18,7 @@ require 'mina/whenever'
 # ---------------------------------------------------------------
 
 # load the conf
-conf = Conf.new
+conf = Bonethug::Conf.new
 cnf = conf.to_hash
 
 # pull config from environment vars
@@ -111,6 +111,11 @@ task :init_db => :environment do
   queue! %[cd #{deploy_to}/current && bundle exec rake db:reset RAILS_ENV="#{env}"] if deploy.get('project_type') == 'rails'
 end
 
+desc "Restores application state to the most recent backup"
+task :backup => :environment do
+  queue! %[cd #{deploy_to}/current && export to=#{env} && bundle exec astrails-safe .bonethug/backup.rb] if deploy.get('project_type') == 'rails'
+end
+
 desc "Restores application state to the most recent backup"
 task :restore_backup => :environment do
   # to be implemented
@@ -194,6 +199,14 @@ task :deploy => :environment do
 
     to :launch do
 
+      if ['rails3'].include? deploy.get('project_type')
+
+        # make sure passenger runs the app as apache
+        queue! %[cd #{deploy_to}/current/config && chown -R www-data:www-data environment.rb]
+        queue! %[cd #{deploy_to}/current && chown -R www-data:www-data config.ru]
+
+      end      
+
       # ensure that the correct directory permissions are set
       queue! %[cd #{deploy_to}/current/public && chown -R www-data:www-data . && chmod -R 775 .]
       queue! %[cd #{deploy_to}/shared/tmp && chown -R www-data:www-data . && chmod -R 775 .]      

data/{skel/base/config/example → config}/schedule.rb

@@ -30,5 +30,5 @@ set :output, {:error => base_path+'/log/cron_error.log', :standard => base_path+
 
 # actual jobs
 every 1.day, :at => '11 pm' do
-  command "cd #{base_path} && export to=#{@environment} && bundle exec astrails-safe config/backup.rb"
+  command "cd #{base_path} && export to=#{@environment} && bundle exec astrails-safe .bonethug/backup.rb"
 end

data/lib/bonethug/cli.rb

@@ -17,10 +17,60 @@ module Bonethug
         # handle args
         type = ARGV[1]
         location = ARGV[2] || '.'
-        puts 'Usage: bonethug install [location]' if type.empty?
+
+        # validate
+        if type.empty?
+          puts 'Usage: bonethug install [type] [location]'
+          return
+        end
+        
+        # run the installer
+        Installer.install type, location
+
+      when 'init', 'update'
+
+        # handle args
+        location = ARGV[1] || '.'
+
+        # validate
+        if location.empty?
+          puts 'Usage: bonethug #{task} [location]'
+          return
+        end
+
+        # run the initaliser
+        Installer.bonethugise(location, task.to_sym)
+
+      when 'deploy', 'setup', 'remote-backup', 'local-backup'
+
+        # handle args
+        environment = ARGV[1]
+
+        # validate
+        if environment.empty?
+          puts 'Usage: bonethug #{task} [environment]' 
+          return
+        end
+
+        case task
+        when 'deploy'
+          exec "export to=#{environment} && bundle exec mina -f .bonethug/deploy.rb deploy --verbose"
+        when 'setup'
+          exec "export to=#{environment} && bundle exec mina -f .bonethug/deploy.rb setup --verbose"
+        when 'remote-backup'
+          exec "export to=#{environment} && bundle exec mina -f .bonethug/deploy.rb backup --verbose"                   
+        when 'local-backup'
+          exec "export to=#{environment} && bundle exec astrails-safe .bonethug/backup.rb" 
+        end 
+
+      when 'watch'
+
+        # handle args
+        type = ARGV[1] || 'all'
+        location = ARGV[2] || '.'        
         
         # run the installer
-        Installer.install type, location 
+        Watcher.watch type, location         
       
       when 'clean'
 

data/lib/bonethug/conf.rb

@@ -0,0 +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
+
+end

data/lib/bonethug/installer.rb

@@ -2,9 +2,11 @@
 # ----------------
 # - Have some sort of safe vs forced install - tie in with exlcuded paths
 # - Check that excluded paths is working in manifest
+# - Gemfile, .gitignore, composer.json need to be no go zones
 # ----------------
 
-require File.expand_path(File.dirname(__FILE__)) + '/../../skel/base/lib/conf'
+require 'rubygems'
+require 'bonethug/conf'
 require 'fileutils'
 require 'find'
 require 'digest/md5'
@@ -17,9 +19,10 @@ module Bonethug
     include FileUtils
     include Digest
 
-    @@skel_dir = File.expand_path(File.dirname(__FILE__)) + '/../../skel'
+    @@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 = ['backup.rb','cnf.yml','deploy.rb','schedule.rb']
+    @@project_config_files = {editable: ['cnf.yml','schedule.rb'], generated: ['backup.rb','deploy.rb']}
 
     def self.install(type, target = '.')
 
@@ -72,20 +75,20 @@ module Bonethug
       puts 'Installing build to ' + target + '...'
       FileUtils.cp_r tmp_dir + '/.', target
 
-      # try to update the configuration files
-      puts 'Updating configs...'
-      self.update_configuration_files(target)
-
       # try to update the configuration files
       puts 'Updating build informtation...'
       self.save_project_meta_data(target)
 
       # 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"
 
+      # try to update the configuration files
+      puts 'Updating configs...'
+      self.bonethugise(target, :init)      
+
     end
 
     def self.clean(target)
@@ -136,48 +139,11 @@ module Bonethug
 
     def self.build_manifest(dir)
       dir_contents = Find.find(dir).map { |p| File.expand_path(p) }
-      manifest = dir_contents - ((@@conf.get('exlcuded_paths') || []).map { |p| File.expand_path(p) })
+      manifest = dir_contents - ((@@conf.get('exlcuded_paths','Array') || []).map { |p| File.expand_path(p) })
       File.open(dir + '/.bonethug/manifest','w') { |file| file.puts manifest.join("\n") }
       self
     end
 
-    def self.update_configuration_files(target)
-
-      # load the existing project's datafile if present
-      meta_data = self.get_project_meta_data target      
-      
-      @@project_config_files.each do |config|
-
-        do_copy       = true
-        example_file  = target + '/config/example/' + config
-        target_file   = target + '/config/' + config
-
-        # analyse the config file + build data file
-        file_exists           = File.exist?(target_file)
-        contents_not_modified = false
-        contents_not_modified = true if file_exists and meta_data and meta_data['config_digests'] and meta_data['config_digests']['example/' + config] == self.contents_md5(target_file) 
-
-        # meta_data_is_hash     = meta_data_exists and meta_data.class.name == 'Hash' and meta_data['config_digests'].class.name == 'Hash'
-        # config_digests_found  = meta_data_is_hash and meta_data['config_digests'].methods.include?('has_key?') and meta_data['config_digests'].has_key?('example/' + config)
-        # contents_not_modified = config_digests_found and meta_data['config_digests']['example/' + config] == self.contents_md5(target_file)
-
-        # don't copy if the file exists...
-        do_copy = false if file_exists
-
-        # unless it hasn't been modified, i.e. probably not conf.yml, but possibly some of the other ones
-
-        do_copy = true if contents_not_modified
-
-        # Copy if that's ok
-        FileUtils.cp example_file, target_file if do_copy
-
-      end
-
-      # return self for chaining
-      self
-
-    end
-
     def self.contents_md5(file)
       return false unless File.exist?(file)
       MD5.digest File.read(file)
@@ -186,7 +152,7 @@ module Bonethug
     def self.save_project_meta_data(base_dir)
 
       meta_data = {'config_digests' => {}}
-      @@project_config_files.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 }
@@ -202,7 +168,78 @@ module Bonethug
       return YAML.load_file data_file if File.exists? data_file
       return false
 
-    end    
+    end
+
+    # mode == :init
+    # copy cnf.yml + schedule.rb to config if possible
+    # 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      
+
+    # mode == :update
+    # copy cnf.yml + schedule.rb to config if possible
+    # 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 
+
+    def self.bonethugise(dir='.', mode=:init)
+
+      target = File.expand_path(dir)
+
+      # check for the existence of required dirs and create if required
+      [target + '/.bonethug', target + '/config', target + '/config/example'].each do |path|
+        FileUtils.mkdir path unless File.directory? path
+      end
+
+      # Handle config files
+      @@project_config_files.each do |type, dirs|
+        dirs.each do |config|
+
+          src_file      = @@bonthug_gem_dir + '/config/' + config
+          example_file  = target + '/config/example/' + config if type == :editable
+          target_file   = type == :editable ? target + '/config/' + config : target + '/.bonethug/' + config
+
+          if mode == :init
+            FileUtils.cp src_file, example_file if type == :editable and !File.exist?(example_file)
+            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)          
+          else
+            raise "invalid bonethugise mode"
+          end
+
+        end
+      end
+
+      # handle gemfile
+      gemfile_path = target + '/Gemfile'
+      if File.exist? gemfile_path
+        gemfile_contents = File.read(gemfile_path)
+        unless /gem ["']bonethug["']/ =~ File.read(gemfile_path)
+          File.open(gemfile_path,'w') { |file| gemfile_contents + "\n" + 'gem "bonethug"' }
+        end
+      else
+        FileUtils.cp @@skel_dir + '/base/Gemfile', gemfile_path
+      end
+
+      # run bundler
+      exec 'bundle install --path vendor --binstubs'
+
+      # self
+
+    end
+
+    def self.update(dir = '.')
+      self.bonethugise(dir,:update)
+    end
+
+    def self.init(dir = '.')
+      self.bonethugise(dir,:init)
+    end  
+
   end
 
 end

data/lib/bonethug/version.rb

@@ -1,3 +1,3 @@
 module Bonethug
-  VERSION = "0.0.7"
+  VERSION = "0.0.10"
 end

data/lib/bonethug/watcher.rb

@@ -0,0 +1,121 @@
+# Todo
+# ----------------
+# - Have some sort of safe vs forced install - tie in with exlcuded paths
+# - Check that excluded paths is working in manifest
+# ----------------
+
+require 'bonethug/conf'
+require 'fileutils'
+require 'find'
+require 'digest/md5'
+require 'yaml'
+
+module Bonethug
+
+  class Watcher
+
+    include FileUtils
+    include Digest
+
+    def self.watch(type = 'all', target = '.')
+
+      # create full path
+      target = File.expand_path target
+
+      # load config
+      puts "Parsing Config..."
+      unless conf = Conf.new.add(target + '/config/cnf.yml')
+        puts "Couldn't find project configuration"
+        return
+      end
+
+      # project type
+      project_type = conf.get('deploy.project_type')
+
+      # end now if its a rails project
+      if ['rails','rails3'].include? project_type
+        puts "Rails doesn't require watching"
+        return
+      end
+
+      sass = []
+      if sasses = conf.get('watch.sass')
+        sasses.each do |index, watch|
+          sass.push(src: watch.get('src','Array'), dest: watch.get('dest'))
+        end
+      end
+
+      coffee = []
+      if coffees = conf.get('watch.coffee')
+        coffees.each do |index, watch|
+          coffee.push(src: watch.get('src','Array'), dest: watch.get('dest'))
+        end
+      end
+
+      # Generate Guardfile
+      puts 'Generating Guardfile...'
+      guardfile_content = ''
+
+      # puts 'Starting Watch Daemons...'
+      # puts 'This may start more than one watch process and you may have to ctrl + c more than once to quit.'
+
+      # sass compiler
+      sass_watch_str = ''
+      sass.each do |watch|
+        filter = watch[:filter] ? "watch '#{watch[:filter]}'" : ""
+        guardfile_content += "
+          guard 'sprockets', :minify => true, :destination => '#{watch[:dest]}', :asset_paths => #{watch[:src].to_s} do
+            #{filter}
+          end
+        "
+      end
+      
+      # # Coffescript compiler
+      coffee_watch_str = ''
+      coffee.each do |watch|
+        filter = watch[:filter] ? "watch '#{watch[:filter]}'" : ""
+        guardfile_content += "
+          guard 'sprockets', :minify => true, :destination => '#{watch[:dest]}', :asset_paths => #{watch[:src].to_s} do
+            #{filter}
+          end
+        "
+      end 
+
+      # save the guardfile
+      File.open(target + '/.bonethug/Guardfile','w') do |file| 
+        file.puts guardfile_content 
+      end
+
+      puts 'Starting Watch Daemon...'
+      cmd = 'bundle exec guard --guardfile ' + target + '/.bonethug/Guardfile'
+      puts "calling: " + cmd
+      exec cmd
+
+      # puts 'Starting Watch Daemons...'
+      # puts 'This may start more than one watch process and you may have to ctrl + c more than once to quit.'
+
+      # # sass compiler
+      # sass_watch_str = ''
+      # sass.each do |watch|
+      #   sass_watch_str += ' '+watch[:src]+':'+watch[:dest]
+      # end
+      # sass_cmd = "sass --watch #{sass_watch_str} --style compressed"
+      
+      # # Coffescript compiler
+      # coffee_watch_str = ''
+      # coffee.each do |watch|
+      #   coffee_watch_str += ' && coffee -o '+watch[:dest]+'/ -cw '+watch[:src]+'/'
+      # end
+      # coffee_cmd = coffee_watch_str
+
+      # # call it
+      # cmd = "#{sass_cmd} #{coffee_cmd}"
+      # puts "Running: " + cmd
+      
+      # log = `#{cmd}` 
+
+    end
+
+  end
+
+end

data/lib/bonethug.rb

@@ -1,5 +1,6 @@
 require "bonethug/version"
 require "bonethug/installer"
+require "bonethug/watcher"
 require "bonethug/cli"
 
 module Bonethug

data/skel/project_types/silverstripe3/composer.json

@@ -8,8 +8,7 @@
     "silverstripe/installer"        : "3.1.*@dev",
     "silverstripe/bootstrap-forms"  : "dev-master",
     "silverstripe/html5"            : "dev-master",
-    "silverstripe/widgets"          : "dev-master",
-    "silverstripe/compass"          : "dev-master"
+    "silverstripe/widgets"          : "dev-master"
   },
   "extra": {
     "installer-paths": {
@@ -17,14 +16,16 @@
       ],
       "public/themes/{$name}": [
         "silverstripe-themes/simple"
-      ],      
+      ],
+      "public": [
+        "silverstripe/installer"
+      ],
       "public/{$name}": [
         "silverstripe/framework",
         "silverstripe/cms",
         "silverstripe/bootstrap-forms",        
         "silverstripe/html5",
         "silverstripe/widgets",
-        "silverstripe/compass"
       ]
     }
   }

data/skel/project_types/silverstripe3/config/example/schedule.rb

@@ -33,26 +33,26 @@ every 1.day, :at => '11 pm' do
   command "cd #{base_path} && export to=#{@environment} && bundle exec astrails-safe config/backup.rb"
 end
 
-every 15.minutes do
-  command "php #{base_path}/public/framework/cli-script.php /QuarterlyHourlyTask"
-end
+# every 15.minutes do
+#   command "php #{base_path}/public/framework/cli-script.php /QuarterlyHourlyTask"
+# end
 
-every 1.hour do
-  command "php #{base_path}/public/framework/cli-script.php /HourlyTask"
-end
+# every 1.hour do
+#   command "php #{base_path}/public/framework/cli-script.php /HourlyTask"
+# end
 
-every 1.day :at => '2am'.minutes do
-  command "php #{base_path}/public/framework/cli-script.php /DailyTask"
-end
+# every 1.day :at => '2am'.minutes do
+#   command "php #{base_path}/public/framework/cli-script.php /DailyTask"
+# end
 
-every 1.week do
-  command "php #{base_path}/public/framework/cli-script.php /WeeklyTask"
-end
+# every 1.week do
+#   command "php #{base_path}/public/framework/cli-script.php /WeeklyTask"
+# end
 
-every 1.month do
-  command "php #{base_path}/public/framework/cli-script.php /MonthlyTask"
-end
+# every 1.month do
+#   command "php #{base_path}/public/framework/cli-script.php /MonthlyTask"
+# end
 
-every 1.year do
-  command "php #{base_path}/public/framework/cli-script.php YearlyTask"
-end
+# every 1.year do
+#   command "php #{base_path}/public/framework/cli-script.php YearlyTask"
+# end

data/skel/project_types/silverstripe3/public/project/_config.php

@@ -36,7 +36,7 @@ $mail = (object) $cnf['mail']['smtp'][APPLICATION_ENV];
 
 // file to url
 $base_dir = __DIR__ . '/..';
-$url = $cnf['apache'][APPLICATION_ENV]['server_name'];
+$url = 'http://'.$cnf['apache'][APPLICATION_ENV]['server_name'];
 $_FILE_TO_URL_MAPPING[$base_dir] = $url;
 
 // Env specific settings

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bonethug
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-21 00:00:00.000000000 Z
+date: 2013-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -92,7 +92,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sprockets
+  name: guard-sprockets
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -107,6 +107,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: wdm
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.0
 description: Project Skeleton Manager
 email:
 - breaks.nz@gmail.com
@@ -123,20 +139,23 @@ files:
 - Rakefile
 - bin/bonethug
 - bonethug.gemspec
+- config/backup.rb
+- config/cnf.yml
+- config/deploy.rb
+- config/schedule.rb
 - lib/bonethug.rb
 - lib/bonethug/cli.rb
+- lib/bonethug/conf.rb
 - lib/bonethug/installer.rb
 - lib/bonethug/utils.rb
 - lib/bonethug/version.rb
+- lib/bonethug/watcher.rb
 - lib/tasks/setup.rake
 - skel/base/.gitignore
 - skel/base/Gemfile
 - skel/base/README.md
-- skel/base/config/example/backup.rb
-- skel/base/config/example/cnf.yml
-- skel/base/config/example/deploy.rb
-- skel/base/config/example/schedule.rb
-- skel/base/lib/conf.rb
+- skel/base/config/example/.gitkeep
+- skel/base/lib/.gitkeep
 - skel/base/log/.gitkeep
 - skel/base/public/apple-touch-icon-114x114-precomposed.png
 - skel/base/public/apple-touch-icon-72x72-precomposed.png
@@ -154,7 +173,6 @@ files:
 - skel/project_types/php/composer.json
 - skel/project_types/silverstripe3/.gitignore
 - skel/project_types/silverstripe3/composer.json
-- skel/project_types/silverstripe3/config.ru
 - skel/project_types/silverstripe3/config/example/schedule.rb
 - skel/project_types/silverstripe3/public/.htaccess
 - skel/project_types/silverstripe3/public/abc/_config.php

data/skel/base/lib/conf.rb

@@ -1,275 +0,0 @@
-require 'yaml'
-
-class Conf
-
-  @@default_paths = {
-    File.expand_path(File.dirname(__FILE__)) + '/../config/cnf.yml'       => nil,
-    File.expand_path(File.dirname(__FILE__)) + '/../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.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

data/skel/project_types/silverstripe3/config.ru

@@ -1,3 +0,0 @@
-environment = Sprockets::Environment.new
-environment.append_path 'public/themes/css'
-environment.append_path 'public/javascript'