cyborg 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de1ffb656fd08f1bc6ce7993f13df4f0d40a8055
-  data.tar.gz: 14313e29b7ae7968042e0027a8498d9953cd2d39
+  metadata.gz: 8d2f44ea7c9403815f3e2e5e02ba3804bdf1e4e1
+  data.tar.gz: 9d74c36a6640a2410c1365040a0b43dd1d873cf7
 SHA512:
-  metadata.gz: 8d55c4eacd4a0e75d6462776143c8e221a9e570b76d2fb05af9a54658fd17019b47e805f6020f4f681835f38767ead191606a66afc3c6d513576cc04f8de6db1
-  data.tar.gz: 844bce677e103e3e487ba0c6adeadb5815ac675f066fc4ac71f6ae55908d408a8b9ce52cac666ff6005afc68d17c7b32540bdcd38edee38358d9ba593e75bf3a
+  metadata.gz: a43f7b67340a52f143d2cd8bfe03391465faf139d449913d14082b05cdb6cb76f0006dcd935ba8a760619708e7572139b8ed7ef22222463489ea8770b06d953c
+  data.tar.gz: 01af22afd859ca34cff2e6c9637555ae56431a09794bb1176805f8bbb35165d5d22fea38944139fcdbc67673154b55ab381840da1b1f749bb8b1f0f0b5189d9e

data/bin/cyborg

@@ -62,6 +62,9 @@ OptionParser.new do |opts|
     opts.on("-p", "--production", "Build assets as with production mode.") do |val|
       options[:production] = true
     end
+    opts.on("-C", "--clean", "Remove cache files before build.") do |val|
+      options[:clean] = true
+    end
   end
 
   opts.on("-v", "--version", "Print version") do |version|
@@ -78,20 +81,4 @@ OptionParser.new do |opts|
   end
 end.parse!
 
-if options[:version]
-  puts "Cyborg version #{Cyborg::VERSION}"
-elsif options[:help]
-
-  if options[:help]
-    puts "Cyborg version #{Cyborg::VERSION}\n\n"
-    puts options[:help]
-
-    # Use this if commands get long
-    #IO.popen("less", "w") do |f| 
-      #f.puts "Cyborg version #{Cyborg::VERSION}"
-      #f.puts options[:help]
-    #end
-  end
-else
-  Cyborg::Command.run(options)
-end
+Cyborg::Command.run(options)

data/lib/cyborg/command.rb

@@ -18,6 +18,13 @@ module Cyborg
         from_root { dispatch(:watch, options) }
       when 'server', 's'
         from_root { dispatch(:server, options) }
+      when 'clean', 'c'
+        from_root { clean }
+      when 'help', 'h'
+        version
+        puts options[:help]
+      when 'version'
+        version
       when 'gem:build'
         from_root { gem_build }
       when 'gem:install'
@@ -27,6 +34,10 @@ module Cyborg
       end
     end
 
+    def version
+      puts "Cyborg version #{Cyborg::VERSION}\n\n"
+    end
+
     def production?
       @production == true
     end
@@ -46,6 +57,15 @@ module Cyborg
       system "bundle exec rake release"
     end
 
+    def require_rails
+      require File.join(Dir.pwd, Cyborg.rails_path('config/application'))
+    end
+
+    def clean
+      require_rails
+      Cyborg.plugin.clean
+    end
+
     # Handles running threaded commands
     #
     def dispatch(command, *args)
@@ -57,7 +77,7 @@ module Cyborg
     # Build assets
     def build(options={})
       puts Cyborg.production? ? 'Building for production…' : 'Building…'
-      require File.join(Dir.pwd, Cyborg.rails_path('config/application'))
+      require_rails
       @threads.concat Cyborg.plugin.build(options)
     end
 

data/lib/cyborg/command/help.rb

@@ -27,6 +27,7 @@ Options:
       when 'build', 'b'; build
       when 'watch', 'w'; watch
       when 'server', 's'; server
+      when 'clean', 'c'; clean
       when 'help', 'h'; help
       when 'gem:build'; gem_build
       when 'gem:install'; gem_install
@@ -50,6 +51,10 @@ Options:
       "server [options]     # Serve documentation site"
     end
 
+    def clean
+      "clean                # Remove cache files"
+    end
+
     def help
       "help [command]       # Show help for a specific command"
     end

data/lib/cyborg/plugin.rb

@@ -92,6 +92,12 @@ module Cyborg
       assets(options).map(&:watch)
     end
 
+    def clean
+      FileUtils.rm_rf(Cyborg.rails_path('tmp/cache/'))
+      FileUtils.rm_rf('.sass-cache')
+      FileUtils.rm_rf(Cyborg.rails_path('.sass-cache'))
+    end
+
     def config(options)
       options = {
         production_asset_root: "/assets/#{name}",

data/lib/cyborg/plugin/assets/javascripts.rb

@@ -9,20 +9,45 @@ module Cyborg
         javascript_include_tag(args)
       end
 
+      def cache_file(name=nil)
+        Cyborg.rails_path("tmp/cache/assets/.browserify-cache-#{name}.json")
+      end
+
       def build
+        files = find_files
+        FileUtils.mkdir_p(File.dirname(cache_file)) if !files.empty?
+
         if Open3.capture3("npm ls browserify-incremental")[1].empty?
-          find_files.each do |file|
-            dest = destination(file).sub(/\.js$/,'')
-            cmd = "browserifyinc --cachefile #{Cyborg.rails_path("tmp/cache/assets/.browserify-cache.json")} #{file} -t babelify --standalone #{plugin.name} -o #{dest}.js -d"
-            cmd += " -p [ minifyify --map #{url(file).sub(/\.js$/,'')}.map.json --output #{dest}.map.json ]" if plugin.maps? || Cyborg.production?
-            system cmd
-            compress(destination(file))
+          files.each do |file|
+            system build_command(file)
+
+            if Cyborg.production?
+              compress(destination(file))
+            end
+
             puts build_msg(file)
           end
         else
           abort "JS BUILD FAILED: browserifyinc NPM module not found.\n" << "Please add browserifyinc to your package.json and run `npm install`"
         end
       end
+
+      def build_command(file)
+        dest = destination(file).sub(/\.js$/,'')
+        options = " -t babelify --standalone #{plugin.name} -o #{dest}.js -d"
+
+        cmd = if Cyborg.production?
+          "browserify #{file} #{options}"
+        else
+          "browserifyinc --cachefile #{cache_file(File.basename(dest))} #{file} #{options}"
+        end
+
+        if Cyborg.production? || plugin.maps?
+          cmd += " -p [ minifyify --map #{url(file).sub(/\.js$/,'')}.map.json --output #{dest}.map.json ]"
+        end
+
+        cmd
+      end
     end
   end
 end

data/lib/cyborg/plugin/assets/stylesheets.rb

@@ -9,7 +9,7 @@ module Cyborg
       def asset_tag(*args)
         stylesheet_link_tag(args)
       end
-
+      
       def build(ext=nil)
         files = find_files
         files = files.reject {|f| !f.match(/\.#{ext}/) } if ext

data/lib/cyborg/version.rb

@@ -1,3 +1,3 @@
 module Cyborg
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cyborg
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-25 00:00:00.000000000 Z
+date: 2016-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass