bonethug 0.0.75 → 0.0.76

data/Gemfile

@@ -30,17 +30,19 @@ end
 
 # asset pipeline - 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', github: 'josh/ruby-coffee-script'
+gem 'uglifier'
 gem 'sass'
 gem 'guard-sass'
 gem 'guard-coffeescript', '1.3.4'
 gem 'guard-erb'
 gem 'guard-slim'
+gem 'guard-uglify', github: 'customink/guard-uglify'
+gem 'guard-concat', github: 'mikz/guard-concat'
 gem 'guard-livereload'
 
 # if RUBY_PLATFORM.downcase.include?('linux')

data/bonethug.gemspec

@@ -50,16 +50,18 @@ Gem::Specification.new do |spec|
 
   # asset pipeline - guard coffeescript / sass
   spec.add_dependency 'coffee-script'
+  spec.add_dependency 'uglifier'
   spec.add_dependency 'sass'
   spec.add_dependency 'guard-sass'
   spec.add_dependency 'guard-coffeescript', '1.3.4'
   spec.add_dependency 'guard-erb'
   spec.add_dependency 'guard-slim'
+  spec.add_dependency 'guard-concat'
+  spec.add_dependency 'guard-uglify'
   spec.add_dependency 'guard-livereload'
 
   # asset pipeline guard sprockets
   spec.add_dependency 'guard-sprockets'
-  spec.add_dependency 'uglifier'
   spec.add_dependency 'sass-rails'
   spec.add_dependency 'coffee-rails'
 
@@ -69,7 +71,6 @@ Gem::Specification.new do |spec|
   # spec.add_dependency 'guard-process'
   # spec.add_dependency 'guard-livereload'
   # spec.add_dependency 'juicer'
-  # spec.add_dependency 'guard-uglify'
 
   # if RUBY_PLATFORM.downcase.include?('linux')
   #   spec.add_dependency 'therubyracer'

data/config/cnf.yml

@@ -169,17 +169,27 @@ vendor:
 watch:
   sass:
     -
-      src: public/themes/project/scss
+      src:  public/themes/project/scss
       dest: public/themes/project/css
       filter: !ruby/regexp '/main\.scss$/'
     -
-      src: public/themes/project/scss
+      src:  public/themes/project/scss
       dest: public/themes/project/css
       filter: !ruby/regexp '/typography\.scss$/'
   coffee:
     -
-      src: public/project/coffee
+      src:  public/project/coffee
       dest: public/project/javascript
       filter: !ruby/regexp '/^.+\.coffee$/'
+  concat_js:
+    -
+      src:  public/project/vendor
+      dest: public/project/javascript
+      filter: "*"
+  uglify:
+    -
+      src:  public/project/javascript
+      dest: public/project/javascript
+      filter: !ruby/regexp '/^.+(?<!min)\.js$/'
 log_dirs:
   - log

data/lib/bonethug/installer.rb

@@ -257,6 +257,9 @@ module Bonethug
         FileUtils.mkdir path unless File.directory? path
       end
 
+      # insert version file
+      File.open(target + '/.bonethug/version','w') { |file| file.puts VERSION }
+
       # Handle config files
       @@project_config_files.each do |type, dirs|
         dirs.each do |config|
@@ -318,12 +321,14 @@ module Bonethug
 
         # identify what we are looking for
         required_gems = {
-          'mina'          => 'nadarei/mina',
-          'astrails-safe' => 'astrails/safe',
-          'whenever'      => 'javan/whenever',
-          'guard-erb'     => 'azt3k/guard-erb',
-          'coffee-script' => 'josh/ruby-coffee-script',
-          'bonethug'      => nil
+          'mina'              => 'nadarei/mina',
+          'astrails-safe'     => 'astrails/safe',
+          'whenever'          => 'javan/whenever',
+          'guard-erb'         => 'azt3k/guard-erb',
+          'coffee-script'     => 'josh/ruby-coffee-script',
+          'guard-uglify'      => 'customink/guard-uglify',
+          'guard-concat'      => 'mikz/guard-concat',
+          'bonethug'          => nil
         }
 
         # look at each requirement and identify if we need things

data/lib/bonethug/version.rb

@@ -1,6 +1,6 @@
 
         module Bonethug
-          VERSION = "0.0.75"
-          BUILD_DATE = "2014-04-01 11:10:26 +1300"
+          VERSION = "0.0.76"
+          BUILD_DATE = "2014-04-05 12:22:32 +1300"
         end
       

data/lib/bonethug/watcher.rb

@@ -1,4 +1,4 @@
-# Todo
+  # Todo
 # ----------------
 # - sass minification isn't working
 # - actually add the filter to filter by type
@@ -54,6 +54,30 @@ module Bonethug
         end
       end
 
+      # concat doesn't support array based input just yet
+      concat_js = []
+      if js_concats = conf.get('watch.concat_js')
+        js_concats.each do |index, watch|
+          concat_js.push(src: watch.get('src','Array'), dest: watch.get('dest'), filter: watch.get('filter'), type: :concat_js)
+        end
+      end
+
+      # concat doesn't support array based input just yet
+      concat_css = []
+      if css_concats = conf.get('watch.concat_css')
+        css_concats.each do |index, watch|
+          concat_css.push(src: watch.get('src','Array'), dest: watch.get('dest'), filter: watch.get('filter'), type: :concat_css)
+        end
+      end
+
+      # uglify doesn't support array based input just yet
+      uglify = []
+      if uglifies = conf.get('watch.uglify')
+        uglifies.each do |index, watch|
+          uglify.push(src: watch.get('src','Array'), dest: watch.get('dest'), filter: watch.get('filter'), type: :uglify)
+        end
+      end
+
       # erb doesn't support array based input just yet
       erb = []
       if erbs = conf.get('watch.erb')
@@ -71,7 +95,7 @@ module Bonethug
       end
 
       # combine the watches
-      watches = coffee + sass + erb + slim
+      watches = coffee + sass + uglify + erb + slim
 
       # Generate Guardfile
       puts 'Generating Guardfile...'
@@ -112,6 +136,20 @@ module Bonethug
                 #{filter}
               end
             "
+          elsif watch[:type] == :concat_css
+            guardfile_content += "
+              guard :concat, :output => '#{watch[:dest]}', :input_dir => #{watch[:src].to_s}, :type => 'css', :files => #{watch[:filter]}
+            "
+          elsif watch[:type] == :concat_js
+            guardfile_content += "
+              guard :concat, :output => '#{watch[:dest]}', :input_dir => #{watch[:src].to_s}, :type => 'js', :files => #{watch[:filter]}
+            "
+          elsif watch[:type] == :uglify
+            guardfile_content += "
+              guard 'uglify', :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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bonethug
 version: !ruby/object:Gem::Version
-  version: 0.0.75
+  version: 0.0.76
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-31 00:00:00.000000000 Z
+date: 2014-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -171,6 +171,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: uglifier
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sass
   requirement: !ruby/object:Gem::Requirement
@@ -252,7 +268,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: guard-livereload
+  name: guard-concat
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -268,7 +284,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: guard-sprockets
+  name: guard-uglify
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -284,7 +300,23 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: uglifier
+  name: guard-livereload
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard-sprockets
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -524,7 +556,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3345157488050916885
+      hash: 737569970789649436
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -533,7 +565,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3345157488050916885
+      hash: 737569970789649436
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23