cyborg 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d2f44ea7c9403815f3e2e5e02ba3804bdf1e4e1
-  data.tar.gz: 9d74c36a6640a2410c1365040a0b43dd1d873cf7
+  metadata.gz: 1965c5ca512f92930d8e71545a5cde4f7dd4f5cb
+  data.tar.gz: 6e471c42e47edc6f1204fd4d5afd1315b103bd28
 SHA512:
-  metadata.gz: a43f7b67340a52f143d2cd8bfe03391465faf139d449913d14082b05cdb6cb76f0006dcd935ba8a760619708e7572139b8ed7ef22222463489ea8770b06d953c
-  data.tar.gz: 01af22afd859ca34cff2e6c9637555ae56431a09794bb1176805f8bbb35165d5d22fea38944139fcdbc67673154b55ab381840da1b1f749bb8b1f0f0b5189d9e
+  metadata.gz: fdd2bb3447a147dbe12d2832d39fe1f83c8607057a57619affbd30296e0bd0d980062e28259f14e2bec5a2402bd178207e1c58e36f08f2558b9af1a56c771868
+  data.tar.gz: e7beb9c432de50056b47f383216da79fb9b7b53eb252b0934296d8cf3a7e48cad3d2ac2b5af483e5ae682e648500c90a182c169d2135eca8d6afac581137297f

data/bin/cyborg

@@ -18,7 +18,7 @@ OptionParser.new do |opts|
   options[:help] = ARGV.shift if %w(help h).include?(ARGV.first)
 
   if ARGV.empty?
-    options[:help] = 'help' # show help as default subcommand
+    options[:help] = true
   else
     options[:command] = next_arg
   end
@@ -68,15 +68,14 @@ OptionParser.new do |opts|
   end
 
   opts.on("-v", "--version", "Print version") do |version|
-    options[:version] = true
+    options[:command] = 'version'
   end
 
   opts.on("-h", "--help", "Print this message") do |version|
     options[:help] = opts
-    options[:command] = 'help'
   end
 
-  if options[:help] == 'help'
+  if options[:help]
     options[:help] = opts
   end
 end.parse!

data/cyborg.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "listen", "~> 3.0"
   spec.add_runtime_dependency 'block_helpers', '~> 0.3.3'
   spec.add_runtime_dependency 'colorize'
+  spec.add_runtime_dependency "bundler", "~> 1.11"
 
   spec.add_runtime_dependency "rails", "~> 4"
   spec.add_dependency 'rack-cors'

data/lib/cyborg/command.rb

@@ -7,7 +7,13 @@ module Cyborg
     extend self
 
     def run(options)
-      @production = options[:production] || !!options[:command].match(/gem/)
+      @production = options[:production]
+
+      if options[:help]
+        version
+        puts options[:help]
+        return
+      end
 
       case options[:command]
       when 'new', 'n'
@@ -20,9 +26,6 @@ module Cyborg
         from_root { dispatch(:server, options) }
       when 'clean', 'c'
         from_root { clean }
-      when 'help', 'h'
-        version
-        puts options[:help]
       when 'version'
         version
       when 'gem:build'

data/lib/cyborg/command/scaffold.rb

@@ -14,7 +14,7 @@ module Cyborg
       puts "Creating new plugin #{@namespace}".bold
       engine_site_scaffold
 
-      @gemspec_path = create_gem
+      @gemspec_path = new_gem
       @path = File.expand_path(File.dirname(@gemspec_path))
 
       fix_gemspec_files
@@ -31,17 +31,9 @@ module Cyborg
 
     # Create a new gem with Bundle's gem command
     #
-    def create_gem
-      begin
-        require 'bundler'
-        require 'bundler/cli'
-        Bundler::CLI.start(['gem', gem])
-
-        Dir.glob(File.join(gem, "/*.gemspec")).first
-
-      rescue LoadError
-        raise "To use this feature you'll need to install the bundler gem with `gem install bundler`."
-      end
+    def new_gem
+      system "bundler gem #{gem}"
+      Dir.glob(File.join(gem, "/*.gemspec")).first
     end
 
     def install_npm_modules

data/lib/cyborg/helpers/asset_helpers.rb

@@ -2,6 +2,10 @@ module Cyborg
   module Helpers
     module AssetsHelper
 
+      def cyborg_asset_url(file)
+        Cyborg.plugin.asset_url(file)
+      end
+
       def stylesheet_tag(*args)
         options = args.last.is_a?(Hash) ? args.pop : {}
         tags = ''
@@ -39,8 +43,16 @@ module Cyborg
         stylesheet_tag + javascript_tag
       end
 
-      def pin_tab_icon(path)
-        %Q{<link rel="mask-icon" mask href="#{path}" color="black">}.html_safe
+      def pin_tab_icon_tag(path, color="black")
+        %Q{<link rel="mask-icon" mask href="#{cyborg_asset_url(path)}" color="#{color}">}.html_safe
+      end
+
+      def favicon_tag(source='favicon.ico', options={})
+        tag('link', {
+          :rel  => 'shortcut icon',
+          :type => 'image/x-icon',
+          :href => cyborg_asset_url(source)
+        }.merge!(options.symbolize_keys))
       end
     end
   end

data/lib/cyborg/plugin.rb

@@ -76,9 +76,9 @@ module Cyborg
 
     def build(options={})
       @maps = options[:maps] || Cyborg.production?
-      root = File.join(destination, asset_root)
-      FileUtils.rm_rf(root) if Cyborg.production?
-      FileUtils.mkdir_p(root)
+      # TODO: be sure gem builds use a clean asset_path
+      #FileUtils.rm_rf(root) if Cyborg.production?
+      FileUtils.mkdir_p(asset_path)
       threads = []
       assets(options).each do |asset|
         threads << Thread.new { asset.build }
@@ -117,7 +117,6 @@ module Cyborg
       end
     end
 
-
     def expand_asset_paths
       @paths.each do |type, path|
         @paths[type] = File.join(root, path)
@@ -125,12 +124,20 @@ module Cyborg
       @destination = File.join(root, @destination)
     end
 
-    def asset_root
-      if Cyborg.production? 
-        plugin.production_asset_root
+    def asset_path(file=nil)
+      dest = File.join(destination, asset_root)
+      dest = File.join(dest, file) if file
+      dest
+    end
+
+    def asset_url(file=nil)
+      path = if Cyborg.production? 
+        production_asset_root
       else
-        plugin.asset_root
+        asset_root
       end
+      path = File.join(path, file) if file
+      path
     end
 
     private

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

@@ -69,11 +69,11 @@ module Cyborg
       end
 
       def destination(path)
-        File.join(plugin.destination, plugin.asset_root, versioned(path))
+        plugin.asset_path(versioned(path))
       end
 
       def url(path)
-        File.join(plugin.asset_root, versioned(path))
+        plugin.asset_url(versioned(path))
       end
 
       def urls(names=nil)

data/lib/cyborg/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cyborg
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-27 00:00:00.000000000 Z
+date: 2016-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.11'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.11'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement