bonethug 0.0.68 → 0.0.69

data/.gitignore

@@ -16,6 +16,7 @@ spec/reports
 test/tmp
 test/version_tmp
 .ruby-version
+.fuse*
 tmp
 *.sublime-project
 *.sublime-workspace

data/Gemfile

@@ -19,8 +19,14 @@ gem 'astrails-safe',    github: 'astrails/safe'
 gem 'whenever',         github: 'javan/whenever'
 
 # guard
-gem 'guard', '>= 1.8.3', '< 2.0' # '>=2.0.5'
-gem 'listen', github: 'guard/listen'
+if RbConfig::CONFIG['target_os'] =~ /mswin|mingw|cygwin/i
+  gem 'wdm', '>= 0.1.0'
+  gem 'guard', '>= 1.8.3', '< 2.0'
+  gem 'listen', '~> 1.3'
+else
+  gem 'guard', '>=2.5.1'
+  gem 'listen', '>=2.6.2'
+end
 
 # asset pipeline - guard sprockets
 gem 'guard-sprockets',  github: 'dormi/guard-sprockets' 
@@ -37,8 +43,6 @@ gem 'guard-erb'
 gem 'guard-slim'
 gem 'guard-livereload'
 
-gem 'wdm', '>= 0.1.0' if RbConfig::CONFIG['target_os'] =~ /mswin|mingw|cygwin/i
-
 # if RUBY_PLATFORM.downcase.include?('linux')
 #   gem 'therubyracer'
 # end

data/bonethug.gemspec

@@ -39,8 +39,14 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'whenever'
 
   # guard
-  spec.add_dependency 'guard', '>= 1.8.3', '< 2.0' # '>=2.0.5'
-  spec.add_dependency 'listen'
+  if RbConfig::CONFIG['target_os'] =~ /mswin|mingw|cygwin/i
+    spec.add_dependency 'wdm', '>= 0.1.0'
+    spec.add_dependency 'guard', '>= 1.8.3', '< 2.0'
+    spec.add_dependency 'listen', '~> 1.3'
+  else
+    spec.add_dependency 'guard', '>=2.5.1'
+    spec.add_dependency 'listen', '>=2.6.2'
+  end
 
   # asset pipeline - guard coffeescript / sass
   spec.add_dependency 'coffee-script'
@@ -65,8 +71,6 @@ Gem::Specification.new do |spec|
   # spec.add_dependency 'juicer'
   # spec.add_dependency 'guard-uglify'
 
-  spec.add_dependency 'wdm', '>= 0.1.0' if RbConfig::CONFIG['target_os'] =~ /mswin|mingw|cygwin/i
-
   # if RUBY_PLATFORM.downcase.include?('linux')
   #   spec.add_dependency 'therubyracer'
   #   spec.add_dependency 'rb-inotify'    

data/config/deploy.rb

@@ -357,9 +357,9 @@ task :deploy => :environment do
 
         # write the to the .haccess file
         queue! %[touch #{deploy_to}/current/public/.htaccess]
-        clean = File.read("#{deploy_to}/current/public/.htaccess").gsub(/\n?## BONETHUG ##.+## END_BONETHUG ##\n?/m, '');
-        escaped = (clean.to_s + htaccess).gsub(/"/, '\"')
-        queue! %[echo "#{escaped}" > #{deploy_to}/current/public/.htaccess]
+        queue! %[sed -i -e "s/\\n?## BONETHUG ##.+## END_BONETHUG ##\\n?//g" #{deploy_to}/current/public/.htaccess]
+        escaped = (htaccess).gsub(/"/, '\"')
+        queue! %[echo "#{escaped}" >> #{deploy_to}/current/public/.htaccess]
 
         # write to the .htpasswd file
         queue! %[touch #{deploy_to}/current/.htpasswd]
@@ -368,9 +368,7 @@ task :deploy => :environment do
 
         # write the to the .haccess file
         queue! %[touch #{deploy_to}/current/public/.htaccess]
-        clean = File.read("#{deploy_to}/current/public/.htaccess").gsub(/\n?## BONETHUG ##.+## END_BONETHUG ##\n?/m, '');
-        escaped = (clean.to_s).gsub(/"/, '\"')
-        queue! %[echo "#{escaped}" > #{deploy_to}/current/public/.htaccess]
+        queue! %[sed -i -e "s/\\n?## BONETHUG ##.+## END_BONETHUG ##\\n?//g" #{deploy_to}/current/public/.htaccess]
 
       end
 
@@ -385,7 +383,7 @@ task :deploy => :environment do
 
       # 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')
-      queue! %[cd #{deploy_to}/current/lib && php flush_drupal_cache.php] if ['drupal','drupal6','drupal7','drupal8'].include? deploy.get('project_type')
+      queue! %[export APPLICATION_ENV=#{env} && cd #{deploy_to}/current/lib && php flush_drupal_cache.php] if ['drupal','drupal6','drupal7','drupal8'].include? deploy.get('project_type')
 
       # run any project scripts
       # purge combined files for ss

data/lib/bonethug/version.rb

@@ -1,6 +1,6 @@
 
         module Bonethug
-          VERSION = "0.0.68"
-          BUILD_DATE = "2014-03-03 10:02:04 +1300"
+          VERSION = "0.0.69"
+          BUILD_DATE = "2014-03-04 11:27:42 +1300"
         end
       

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

@@ -1,11 +1,14 @@
-<?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';
+
+    require_once $pub_dir . '/includes/bootstrap.inc';
+    drupal_bootstrap(DRUPAL_BOOTSTRAP_FULL);
+    drupal_flush_all_caches();
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bonethug
 version: !ruby/object:Gem::Version
-  version: 0.0.68
+  version: 0.0.69
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-02 00:00:00.000000000 Z
+date: 2014-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -130,10 +130,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.8.3
-    - - <
-      - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -141,10 +138,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.8.3
-    - - <
-      - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.5.1
 - !ruby/object:Gem::Dependency
   name: listen
   requirement: !ruby/object:Gem::Requirement
@@ -152,7 +146,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.6.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -160,7 +154,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.6.2
 - !ruby/object:Gem::Dependency
   name: coffee-script
   requirement: !ruby/object:Gem::Requirement
@@ -509,12 +503,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3738171120857185268
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3738171120857185268
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23