bonethug 0.0.69 → 0.0.70

data/Gemfile

@@ -29,16 +29,16 @@ else
 end
 
 # asset pipeline - guard sprockets
-gem 'guard-sprockets',  github: 'dormi/guard-sprockets' 
+gem 'guard-sprockets', github: 'dormi/guard-sprockets'
 gem 'uglifier'
 gem 'sass-rails'
 gem 'coffee-rails'
 
 # asset pipeline - guard not sprockets
-gem 'coffee-script'
+gem 'coffee-script', github: 'josh/ruby-coffee-script'
 gem 'sass'
 gem 'guard-sass'
-gem 'guard-coffeescript'
+gem 'guard-coffeescript', '1.3.4'
 gem 'guard-erb'
 gem 'guard-slim'
 gem 'guard-livereload'

data/ISSUES.txt

@@ -1 +1,2 @@
-- guard 2 seems to not work - using 1.8.3 in the mean time
+- guard 2 seems to not work in windows - using 1.8.3 in the mean time
+- guard-coffeescript 1.4.0 doesn't work

data/bonethug.gemspec

@@ -52,7 +52,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'coffee-script'
   spec.add_dependency 'sass'
   spec.add_dependency 'guard-sass'
-  spec.add_dependency 'guard-coffeescript'
+  spec.add_dependency 'guard-coffeescript', '1.3.4'
   spec.add_dependency 'guard-erb'
   spec.add_dependency 'guard-slim'
   spec.add_dependency 'guard-livereload'
@@ -61,7 +61,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'guard-sprockets'
   spec.add_dependency 'uglifier'
   spec.add_dependency 'sass-rails'
-  spec.add_dependency 'coffee-rails'  
+  spec.add_dependency 'coffee-rails'
 
   # spec.add_dependency 'rb-fsevent'
   # spec.add_dependency 'compass'
@@ -73,7 +73,7 @@ Gem::Specification.new do |spec|
 
   # if RUBY_PLATFORM.downcase.include?('linux')
   #   spec.add_dependency 'therubyracer'
-  #   spec.add_dependency 'rb-inotify'    
+  #   spec.add_dependency 'rb-inotify'
   # end
 
   # if RUBY_PLATFORM.downcase.include?('darwin')

data/config/deploy.rb

@@ -155,7 +155,7 @@ task :init_db => :environment do
 end
 
 desc "Initialises the db"
-task :init_db => :environment do
+task :setup_db => :environment do
 
   #rails
   queue! %[cd #{deploy_to}/current && bundle exec rake db:reset RAILS_ENV="#{env}"] if deploy.get('project_type') =~ /rails[0-9]?/
@@ -378,8 +378,9 @@ task :deploy => :environment do
 
       # handle cron
       invoke :'whenever:update'
-      queue "echo \"\nPlease review the crontab below!!\n\n\""
+      queue "echo \"\nPlease review the crontab below!!\n\""
       queue 'crontab -l'
+      queue "echo \"\n\n\""
 
       # run cache flushes / manifest rebuilds
       queue! %[export APPLICATION_ENV=#{env} && php #{deploy_to}/current/public/framework/cli-script.php dev/build] if ['silverstripe','silverstripe3'].include? deploy.get('project_type')

data/config/syncer.rb

@@ -10,26 +10,30 @@ require 'bonethug/conf'
 
 # load the conf
 conf = Bonethug::Conf.new
-cnf = conf.to_hash
+cnf  = conf.to_hash
+envs = conf.get 'deploy.environments'
 
 # args
-env = ARGV[1]
-type = ARGV[0]
+env_local  = ARGV[1]
+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 conf.get('deploy.environments').has_key? env
+raise 'could not find deployment environment' unless envs.has_key? env_local and envs.has_key? env_remote
 
 # build config
-deploy    = conf.node_merge('deploy.common','deploy.environments.'+env)
-resources = conf.get('resources','Array') || []
-log_dirs  = conf.get('log_dirs','Array') || []
-vendor  = conf.get('vendor','Array') || []
-
-# vhost name
-vhost = deploy.get('project_slug') + '_' + env
-
-# composer?
-use_composer = ['silverstripe','silverstripe3','drupal','php'].include? deploy.get('project_type')
+remote_deploy = conf.node_merge 'deploy.common', 'deploy.environments.' + env_local
+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'
 
 # directories we need to track
 resources += ['backups']
@@ -38,15 +42,37 @@ resources += ['backups']
 log_dirs.push 'log' unless log_dirs.include? 'log'
 
 # do the common work
-path = deploy.get('base_dir') + '/' + vhost
-ssh_pass = rsync.get('pass') ? "sshpass -p #{rsync.get('pass')}" : ""
-queue! %[#{ssh_pass} ssh #{rsync.get('user')}@#{rsync.get('host')} mkdir -p #{path}]
+remote_path = remote_deploy.get('base_dir') + '/' + remote_vhost
+remote_ssh  = "ssh -p #{remote_deploy.get 'port'} #{remote_deploy.get 'user'}@#{remote_deploy.get 'domain'}"
+
+# output
+puts "Cloning Databases... "
+
+# output
+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'}\""
+  end
+
+end
+
+puts "Done."
+puts "Syncing Files... "
+
+# sync the files
 (resources + log_dirs).each do |item|
   case type
   when "sync-local-from"
-    exec "rsync -r -a -v -e \"#{ssh_pass} ssh -l #{rsync.get('user')}\" --delete --copy-dirlinks #{rsync.get('host')}:#{path}/current/#{item} ./"
+    system "rsync -r -a -v -e \"#{ssh_pass} ssh -l #{rsync.get('user')}\" --delete --copy-dirlinks #{rsync.get('host')}:#{path}/current/#{item} ./"
   when "sync-local-to"
-    exec "rsync -r -a -v -e \"#{ssh_pass} ssh -l #{rsync.get('user')}\" --delete --copy-dirlinks ./#{item} #{rsync.get('host')}:#{path}/current/"
+    system "rsync -r -a -v -e \"#{ssh_pass} ssh -l #{rsync.get('user')}\" --delete --copy-dirlinks ./#{item} #{rsync.get('host')}:#{path}/current/"
   end
-end
+end
+
+puts "Done."

data/lib/bonethug/cli.rb

@@ -47,7 +47,7 @@ module Bonethug
         # run the installer
         Installer.install type, location
 
-      when 'init-db', 'init-local-db'
+      when 'init-db', 'init-local-db', 'setup-db'
 
         # handle args
         env = ARGV.last
@@ -61,6 +61,8 @@ module Bonethug
 
         if task == 'init-local-db'
           Installer.execute_init_mysql_db_script env, admin_user
+        elsif task == 'setup-db'
+          exec "export to=#{env} && export admin_user=#{admin_user} && bundle exec mina -f .bonethug/deploy.rb setup_db --verbose"
         else
           exec "export to=#{env} && export admin_user=#{admin_user} && bundle exec mina -f .bonethug/deploy.rb init_db --verbose"
         end
@@ -156,15 +158,28 @@ module Bonethug
 
         end
 
+      when  'sync-local-to',
+            'sync-local-from'
+
+        # args
+        env_local  = ARGV[1]
+        env_remote = ARGV[0]
+
+        # validate
+        unless env_local and env_remote
+          puts 'Usage: thug #{task} [local_environment] [remote_environment]'
+          return
+        end
+
+        # run the script
+        exec "ruby .bonethug/syncer.rb #{task} #{env_local} #{env_remote}"
+
       when  'deploy',
             'setup',
             'remote-backup',
             'local-backup',
             'sync-backup-to',
             'sync-backup-from',
-            'sync-local-to',
-            'sync-local-from',
-            'init-db',
             'force-unlock',
             'cleanup'
 
@@ -186,16 +201,14 @@ module Bonethug
           exec "export to=#{environment} && bundle exec mina -f .bonethug/deploy.rb setup --verbose"
 
         # remote mina scripts
-        when 'init-db'
-          exec "export to=#{environment} && bundle exec mina -f .bonethug/deploy.rb init_db --verbose"
         when 'force-unlock'
           exec "export to=#{environment} && bundle exec mina -f .bonethug/deploy.rb deploy:force_unlock --verbose"
         when 'cleanup'
-          exec "export to=#{environment} && bundle exec mina -f .bonethug/deploy.rb deploy:cleanup --verbose"      
+          exec "export to=#{environment} && bundle exec mina -f .bonethug/deploy.rb deploy:cleanup --verbose"
 
         # Snapshot Backup
         when 'remote-backup'
-          exec "export to=#{environment} && bundle exec mina -f .bonethug/deploy.rb backup --verbose"                   
+          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"
 
@@ -205,22 +218,18 @@ module Bonethug
         when 'sync-backup-from'
           exec "export to=#{environment} && bundle exec mina -f .bonethug/deploy.rb sync_from --verbose"
 
-        when 'sync-local-to'
-          exec "ruby .bonethug/syncer.rb sync_local_to #{environment}"
-        when 'sync-local-from'
-          exec "ruby .bonethug/syncer.rb sync_local_from #{environment}"                 
-        end 
+        end
 
       when 'watch'
 
         # handle args
         type = ARGV[1] || 'coffee_sass'
         location = ARGV[2] || '.'
-        watch_only = ARGV[3] || nil   
-        
+        watch_only = ARGV[3] || nil
+
         # run the installer
-        Watcher.watch type, location, watch_only   
-      
+        Watcher.watch type, location, watch_only
+
       when 'clean'
 
         location = ARGV[1] || '.'

data/lib/bonethug/installer.rb

@@ -301,7 +301,7 @@ module Bonethug
               src_file =  @@bonthug_gem_dir + '/skel/project_types/' + project_type + '/' + file
               dst_file = target + '/' + file
               FileUtils.cp src_file, dst_file
-              
+
             end
           end
         else
@@ -322,6 +322,7 @@ module Bonethug
           'astrails-safe' => 'astrails/safe',
           'whenever'      => 'javan/whenever',
           'guard-erb'     => 'azt3k/guard-erb',
+          'coffee-script' => 'josh/ruby-coffee-script',
           'bonethug'      => nil
         }
 
@@ -372,7 +373,7 @@ module Bonethug
 
     def self.init(dir = '.')
       self.bonethugise(dir,:init)
-    end  
+    end
 
   end
 

data/lib/bonethug/version.rb

@@ -1,6 +1,6 @@
 
         module Bonethug
-          VERSION = "0.0.69"
-          BUILD_DATE = "2014-03-04 11:27:42 +1300"
+          VERSION = "0.0.70"
+          BUILD_DATE = "2014-03-17 10:21:25 +1300"
         end
       

data/lib/bonethug/watcher.rb

@@ -1,151 +1,151 @@
-# Todo
-# ----------------
-# - sass minification isn't working
-# - actually add the filter to filter by type
-# - make type filtering more flexible so other types can be used without code modifications
-# ----------------
-
-require 'bonethug/conf'
-require 'fileutils'
-require 'find'
-require 'digest/md5'
-require 'yaml'
-require 'rbconfig'
-
-module Bonethug
-
-  class Watcher
-
-    include FileUtils
-    include Digest
-
-    def self.watch(type = nil, target = '.', watch_only = nil)
-
-      # 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'), filter: watch.get('filter'), type: :sass)
-        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'), filter: watch.get('filter'), type: :coffee)
-        end
-      end
-
-      # erb doesn't support array based input just yet
-      erb = []
-      if erbs = conf.get('watch.erb')
-        erbs.each do |index, watch|
-          erb.push(src: watch.get('src','Array'), dest: watch.get('dest'), filter: watch.get('filter'), type: :erb)
-        end
-      end
-
-      # slim doesn't support aray based inputs just yet
-      slim = []
-      if slims = conf.get('watch.slim')
-        slims.each do |index, watch|
-          slim.push(src: watch.get('src','Array'), dest: watch.get('dest'), filter: watch.get('filter'), type: :slim)
-        end
-      end  
-
-      # combine the watches
-      watches = coffee + sass + erb + slim
-
-      # Generate Guardfile
-      puts 'Generating Guardfile...'
-
-      guardfile_content = ''
-      watches.each do |watch|
-
-        case watch[:filter].class.name
-        when 'NilClass'
-          watch_val = ''
-        when 'String'
-          watch_val = "'#{watch[:filter]}'"
-        when 'Regexp'
-          watch_val = watch[:filter].inspect
-        else
-          raise "invalid filter type: " + watch[:filter].class.name
-        end
-        
-        filter = watch[:filter] ? "watch #{watch_val}" : ""
-        
-        case type
-        when 'sprockets'
-          guardfile_content += "
-            guard 'sprockets', :minify => true, :destination => '#{watch[:dest]}', :asset_paths => #{watch[:src].to_s} do
-              #{filter}
-            end
-          "
-        else
-          if watch[:type] == :coffee
-            guardfile_content += "
-              guard :coffeescript, :minify => true, :output => '#{watch[:dest]}', :input => #{watch[:src].to_s} do
-                #{filter}
-              end
-            "
-          elsif watch[:type] == :sass
-            guardfile_content += "
-              guard :sass, :style => :compressed, :debug_info => true, :output => '#{watch[:dest]}', :input => #{watch[:src].to_s} do
-                #{filter}
-              end
-            "
-          elsif watch[:type] == :erb
-            guardfile_content += "
-              guard :erb, :debug_info => true, :output => '#{watch[:dest]}', :input => #{watch[:src].to_s} do
-                #{filter}
-              end
-            "
-          elsif watch[:type] == :slim
-            guardfile_content += "
-              guard :slim, :debug_info => true, :output => '#{watch[:dest]}', :input => #{watch[:src].to_s} do
-                #{filter}
-              end
-            "
-          end
-        end
-
-      end
-
-      # save the guardfile
-      guardfile = target + '/.bonethug/Guardfile'
-      FileUtils.rm_rf guardfile
-      File.open(guardfile,'w') do |file| 
-        file.puts guardfile_content 
-      end
-
-      puts 'Starting Watch Daemon...'
-      # guard 2.0.x polling fix
-      # poll = RbConfig::CONFIG['target_os'] =~ /mswin|mingw|cygwin/i ? '--force-polling' : ''
-      poll = ''
-      cmd = 'bundle exec guard --debug ' + poll + ' --guardfile "' + target + '/.bonethug/Guardfile"'
-      puts cmd
-      exec cmd
-
-    end
-
-  end
-
+# Todo
+# ----------------
+# - sass minification isn't working
+# - actually add the filter to filter by type
+# - make type filtering more flexible so other types can be used without code modifications
+# ----------------
+
+require 'bonethug/conf'
+require 'fileutils'
+require 'find'
+require 'digest/md5'
+require 'yaml'
+require 'rbconfig'
+
+module Bonethug
+
+  class Watcher
+
+    include FileUtils
+    include Digest
+
+    def self.watch(type = nil, target = '.', watch_only = nil)
+
+      # 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'), filter: watch.get('filter'), type: :sass)
+        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'), filter: watch.get('filter'), type: :coffee)
+        end
+      end
+
+      # erb doesn't support array based input just yet
+      erb = []
+      if erbs = conf.get('watch.erb')
+        erbs.each do |index, watch|
+          erb.push(src: watch.get('src','Array'), dest: watch.get('dest'), filter: watch.get('filter'), type: :erb)
+        end
+      end
+
+      # slim doesn't support aray based inputs just yet
+      slim = []
+      if slims = conf.get('watch.slim')
+        slims.each do |index, watch|
+          slim.push(src: watch.get('src','Array'), dest: watch.get('dest'), filter: watch.get('filter'), type: :slim)
+        end
+      end
+
+      # combine the watches
+      watches = coffee + sass + erb + slim
+
+      # Generate Guardfile
+      puts 'Generating Guardfile...'
+
+      guardfile_content = ''
+      watches.each do |watch|
+
+        case watch[:filter].class.name
+        when 'NilClass'
+          watch_val = ''
+        when 'String'
+          watch_val = "'#{watch[:filter]}'"
+        when 'Regexp'
+          watch_val = watch[:filter].inspect
+        else
+          raise "invalid filter type: " + watch[:filter].class.name
+        end
+
+        filter = watch[:filter] ? "watch #{watch_val}" : ""
+
+        case type
+        when 'sprockets'
+          guardfile_content += "
+            guard 'sprockets', :minify => true, :destination => '#{watch[:dest]}', :asset_paths => #{watch[:src].to_s} do
+              #{filter}
+            end
+          "
+        else
+          if watch[:type] == :coffee
+            guardfile_content += "
+              guard :coffeescript, :output => '#{watch[:dest]}', :input => #{watch[:src].to_s} do
+                #{filter}
+              end
+            "
+          elsif watch[:type] == :sass
+            guardfile_content += "
+              guard :sass, :style => :compressed, :debug_info => true, :output => '#{watch[:dest]}', :input => #{watch[:src].to_s} do
+                #{filter}
+              end
+            "
+          elsif watch[:type] == :erb
+            guardfile_content += "
+              guard :erb, :debug_info => true, :output => '#{watch[:dest]}', :input => #{watch[:src].to_s} do
+                #{filter}
+              end
+            "
+          elsif watch[:type] == :slim
+            guardfile_content += "
+              guard :slim, :debug_info => true, :output => '#{watch[:dest]}', :input => #{watch[:src].to_s} do
+                #{filter}
+              end
+            "
+          end
+        end
+
+      end
+
+      # save the guardfile
+      guardfile = target + '/.bonethug/Guardfile'
+      FileUtils.rm_rf guardfile
+      File.open(guardfile,'w') do |file|
+        file.puts guardfile_content
+      end
+
+      puts 'Starting Watch Daemon...'
+      # guard 2.0.x polling fix
+      # poll = RbConfig::CONFIG['target_os'] =~ /mswin|mingw|cygwin/i ? '--force-polling' : ''
+      poll = ''
+      cmd = 'bundle exec guard --debug ' + poll + ' --guardfile "' + target + '/.bonethug/Guardfile"'
+      puts cmd
+      exec cmd
+
+    end
+
+  end
+
 end

data/skel/base/.gitignore

@@ -1,8 +1,10 @@
-# project framework
-/.bundle
-/vendor
-/logs/*
-/backups/*
-/db_dumps
-/tmp/*
-/vendor/ruby
+# project framework
+/.bundle
+/vendor
+/logs/*
+/backups/*
+/db_dumps
+/tmp/*
+/vendor/ruby
+*.sublime-project
+*.sublime-workspace

data/skel/project_types/drupal/lib/flush_drupal_cache.php

@@ -1,11 +1,15 @@
-<?php
-
-$pub_dir = realpath(__DIR__ . '/../public');
-chdir($pub_dir);
-define('DRUPAL_ROOT', $pub_dir);
-
-if (file_exists($pub_dir . '/includes/bootstrap.inc')) {
-    require_once $pub_dir . '/includes/bootstrap.inc';
-    drupal_bootstrap(DRUPAL_BOOTSTRAP_FULL);
-    drupal_flush_all_caches();
+<?php
+
+$pub_dir = realpath(__DIR__ . '/../public');
+chdir($pub_dir);
+define('DRUPAL_ROOT', $pub_dir);
+
+if (file_exists($pub_dir . '/includes/bootstrap.inc')) {
+
+	$_SERVER['REMOTE_ADDR'] 	= '127.0.0.1';
+	$_SERVER['REQUEST_METHOD']	= 'GET';
+
+    require_once $pub_dir . '/includes/bootstrap.inc';
+    drupal_bootstrap(DRUPAL_BOOTSTRAP_FULL);
+    drupal_flush_all_caches();
 }

data/skel/project_types/drupal6/lib/flush_drupal_cache.php

@@ -1,11 +1,15 @@
-<?php
-
-$pub_dir = realpath(__DIR__ . '/../public');
-chdir($pub_dir);
-define('DRUPAL_ROOT', $pub_dir);
-
-if (file_exists($pub_dir . '/includes/bootstrap.inc')) {
-    require_once $pub_dir . '/includes/bootstrap.inc';
-    drupal_bootstrap(DRUPAL_BOOTSTRAP_FULL);
-    drupal_flush_all_caches();
+<?php
+
+$pub_dir = realpath(__DIR__ . '/../public');
+chdir($pub_dir);
+define('DRUPAL_ROOT', $pub_dir);
+
+if (file_exists($pub_dir . '/includes/bootstrap.inc')) {
+
+	$_SERVER['REMOTE_ADDR'] 	= '127.0.0.1';
+	$_SERVER['REQUEST_METHOD']	= 'GET';
+
+    require_once $pub_dir . '/includes/bootstrap.inc';
+    drupal_bootstrap(DRUPAL_BOOTSTRAP_FULL);
+    drupal_flush_all_caches();
 }

data/skel/project_types/drupal7/composer.json

@@ -1,21 +1,21 @@
-{
-    "name": "bonethug/drupal7-skel", 
-    "repositories": [
-        {
-            "type": "vcs",
-            "url": "git@github.com:azt3k/drupal.git"
-        }
-    ], 
-    "require": {
-        "symfony/yaml"              : "2.3.*@dev",
-        "drush/drush"               : "dev-master",
-        "thecodingmachine/drupal"   : "7.*@dev"   
-    },
-    "extra": {
-        "installer-paths": {
-            "vendor": [],
-            "public": [],
-            "public/vendor/{$name}": []      
-        }
-    }
+{
+    "name": "bonethug/drupal7-skel",
+    "repositories": [
+        {
+            "type": "vcs",
+            "url": "git@github.com:azt3k/drupal.git"
+        }
+    ],
+    "require": {
+        "symfony/yaml"              : "2.3.*@dev",
+        "drush/drush"               : "dev-master",
+        "thecodingmachine/drupal"   : "7.*@dev"
+    },
+    "extra": {
+        "installer-paths": {
+            "vendor": [],
+            "public": [],
+            "public/vendor/{$name}": []
+        }
+    }
 }

data/skel/project_types/drupal7/lib/flush_drupal_cache.php

@@ -6,7 +6,8 @@ define('DRUPAL_ROOT', $pub_dir);
 
 if (file_exists($pub_dir . '/includes/bootstrap.inc')) {
 
-	$_SERVER['REMOTE_ADDR'] = '127.0.0.1';
+	$_SERVER['REMOTE_ADDR'] 	= '127.0.0.1';
+	$_SERVER['REQUEST_METHOD']	= 'GET';
 
     require_once $pub_dir . '/includes/bootstrap.inc';
     drupal_bootstrap(DRUPAL_BOOTSTRAP_FULL);

data/skel/project_types/php/.gitignore

@@ -1,13 +1,17 @@
-# project framework
-/.bundle
-/vendor
-/bin
-/logs/*
-/backups/*
-/db_dumps
-/tmp/*
-/composer.phar
-
-# components tracked by composer
-/public/assets/*
-/vendor
+# project framework
+/.bundle
+/vendor
+/bin
+/logs/*
+/backups/*
+/db_dumps
+/tmp/*
+/composer.phar
+
+# components tracked by composer
+/public/assets/*
+/vendor
+
+# project files
+*.sublime-workspace
+*.sublime-project

data/skel/project_types/php/composer.json

@@ -1,5 +1,5 @@
-{
-    "require": {
-        "symfony/yaml" : "2.3.*@dev"
-    }
+{
+    "require": {
+        "symfony/yaml" : "2.5.*@dev"
+    }
 }

data/skel/project_types/silverstripe3/.gitignore

@@ -1,27 +1,31 @@
-# project framework
-/.bundle
-/vendor
-/bin
-/log/*
-/backups/*
-/db_dumps
-/tmp/*
-/composer.phar
-.sass-cache
-/public/assets/*
-/public/vendor/*
-/vendor/ruby
-
-# components tracked by composer
-/public/silverstripe-cache/*
-/public/bootstrap_forms
-/public/cms
-/public/abc-silverstripe
-/public/abc-silverstripe-mailer
-/public/framework
-/public/html5
-
-# files to keep
-!.gitkeep
-!/public/assets/error-404.html
-!/public/assets/error-500.html
+# project framework
+/.bundle
+/vendor
+/bin
+/log/*
+/backups/*
+/db_dumps
+/tmp/*
+/composer.phar
+.sass-cache
+/public/assets/*
+/public/vendor/*
+/vendor/ruby
+
+# project files
+*.sublime-workspace
+*.sublime-project
+
+# components tracked by composer
+/public/silverstripe-cache/*
+/public/bootstrap_forms
+/public/cms
+/public/abc-silverstripe
+/public/abc-silverstripe-mailer
+/public/framework
+/public/html5
+
+# files to keep
+!.gitkeep
+!/public/assets/error-404.html
+!/public/assets/error-500.html

data/skel/project_types/silverstripe3/composer.json

@@ -1,14 +1,14 @@
 {
   "name" : "bonethug/ss3-skel",
   "require" : {
-    "symfony/yaml"                      : "2.5.*@dev",     
+    "symfony/yaml"                      : "2.5.*@dev",
     "silverstripe/framework"            : "3.1.*@dev",
     "silverstripe/cms"                  : "3.1.*@dev",
     "silverstripe/html5"                : "dev-master",
     "phpmailer/phpmailer"               : "dev-master",
     "azt3k/abc-silverstripe"            : "dev-master",
     "azt3k/abc-silverstripe-mailer"     : "dev-master",
-    "nathancox/minify"                  : "dev-master" 
+    "nathancox/minify"                  : "dev-master"
   },
   "extra": {
     "installer-paths": {
@@ -16,7 +16,7 @@
       ],
       "public/{$name}": [
         "silverstripe/framework",
-        "silverstripe/cms",     
+        "silverstripe/cms",
         "silverstripe/html5",
         "azt3k/abc-silverstripe",
         "azt3k/abc-silverstripe-mailer",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bonethug
 version: !ruby/object:Gem::Version
-  version: 0.0.69
+  version: 0.0.70
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-03 00:00:00.000000000 Z
+date: 2014-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -208,17 +208,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.4
 - !ruby/object:Gem::Dependency
   name: guard-erb
   requirement: !ruby/object:Gem::Requirement
@@ -505,7 +505,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3738171120857185268
+      hash: 2684865245615476395
 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: 3738171120857185268
+      hash: 2684865245615476395
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23