cyborg 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07f10e98822a1c85fef58e64172d84c27f5c6411
-  data.tar.gz: 3a672afc95f926981c9960c653878856a5954efc
+  metadata.gz: de1ffb656fd08f1bc6ce7993f13df4f0d40a8055
+  data.tar.gz: 14313e29b7ae7968042e0027a8498d9953cd2d39
 SHA512:
-  metadata.gz: 4e28ba651014ba3e67018cda38c4bca465e92f88ecddbb4de00546b1e6975a5d950ad18de5d545dcb48c4cc13a297cf1e0e3d16716222f51ca695a697f4f637b
-  data.tar.gz: c601e198c70fc951f4e74e82fb51dfcf2e17fb3c9e3fda2f220a933e628401171e09a8fc97793f5d193307a65f2dc8e6c83519d0c1d9f2b99105d0cd9f2113d6
+  metadata.gz: 8d55c4eacd4a0e75d6462776143c8e221a9e570b76d2fb05af9a54658fd17019b47e805f6020f4f681835f38767ead191606a66afc3c6d513576cc04f8de6db1
+  data.tar.gz: 844bce677e103e3e487ba0c6adeadb5815ac675f066fc4ac71f6ae55908d408a8b9ce52cac666ff6005afc68d17c7b32540bdcd38edee38358d9ba593e75bf3a

data/bin/cyborg

@@ -28,7 +28,11 @@ OptionParser.new do |opts|
   if %w(n new).include? options[:command]
     options[:name] = next_arg
 
-    opts.on("-f", "--force", "Overwrite existing files") do |val|
+    opts.on("-e", "--engine ENGINE_NAME", String, "Name the engine (defaults to gem name)") do |engine|
+      options[:engine] = engine
+    end
+
+    opts.on("-f", "--force", "overwrite existing files") do |val|
       options[:force] = true
     end
   end

data/lib/cyborg.rb

@@ -22,6 +22,7 @@ module Cyborg
 
   def register(plugin_module, options={})
     @plugin = plugin_module.new(options)
+    @plugin.create_engine
     patch_rails
   end
 

data/lib/cyborg/command.rb

@@ -11,7 +11,7 @@ module Cyborg
 
       case options[:command]
       when 'new', 'n'
-        Scaffold.new(options[:name])
+        Scaffold.new(options)
       when 'build', 'b'
         from_root { dispatch(:build, options) }
       when 'watch', 'w'

data/lib/cyborg/command/npm.rb

@@ -21,17 +21,11 @@ module Cyborg
 
       if File.exist?(package_path)
         update_package_json
-        install
       else
         write_package_json(DEPENDENCIES)
-        install
       end
     end
 
-    def install
-      system "npm install"
-    end
-
     def package_path
       File.join(Dir.pwd, 'package.json')
     end

data/lib/cyborg/command/scaffold.rb

@@ -2,14 +2,16 @@ require 'fileutils'
 
 module Cyborg
   class Scaffold
-    attr_reader :name, :spec, :path, :gemspec_path
+    attr_reader :gem, :engine, :namespace, :plugin_module, :spec, :path, :gemspec_path
 
-    def initialize(name)
+    def initialize(options)
       @cwd = Dir.pwd
-      @name = name.downcase
-      @module_name = name.split('_').collect(&:capitalize).join
+      @gem = underscorize(options[:name])
+      @engine = underscorize(options[:engine] || options[:name])
+      @namespace = @engine
+      @plugin_module = modulize @engine
 
-      puts "Creating new plugin #{name}".bold
+      puts "Creating new plugin #{@namespace}".bold
       engine_site_scaffold
 
       @gemspec_path = create_gem
@@ -33,9 +35,9 @@ module Cyborg
       begin
         require 'bundler'
         require 'bundler/cli'
-        Bundler::CLI.start(['gem', name])
+        Bundler::CLI.start(['gem', gem])
 
-        Dir.glob(File.join(name, "/*.gemspec")).first
+        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`."
@@ -51,11 +53,7 @@ module Cyborg
     # First remove scaffold spec.files (which rely on git) to avoid errors
     # when loading the spec
     def fix_gemspec_files
-      gs = File.read(gemspec_path)
-
-      File.open(gemspec_path, 'w') do |io|
-        io.write gs.gsub(/^.+spec\.files.+$/,'')
-      end
+      write_file(gemspec_path, File.read(gemspec_path).gsub(/^.+spec\.files.+$/,''))
     end
 
     def bootstrap_gem
@@ -64,61 +62,55 @@ module Cyborg
       FileUtils.rm_rf(File.join(path, 'bin'))
 
       # Simplify gempsec and set up to add assets properly
-      File.open(gemspec_path, 'w') do |io|
-        io.write gemspec
-      end
+      write_file(gemspec_path, gemspec)
 
-      action_log "update", gemspec_path
+      write_file("#{gem}/lib/#{gem}.rb", %Q{require 'cyborg'
+require '#{gem}/version'
 
-      File.open "#{name}/lib/#{name}.rb", 'w' do |io|
-        io.write %Q{require 'megatron'
-require '#{name}/version'
-
-module #{@module_name}
+module #{modulize(gem)}
   class Plugin < Cyborg::Plugin
   end
 end
 
-Cyborg.register(#{@module_name}::Plugin, {
-  name: '#{name}'
-})}
-      end
-      action_log "update", "#{name}/lib/#{name}.rb"
+Cyborg.register(#{modulize(gem)}::Plugin, {
+  #{cyborg_plugin_config}
+})})
+    end
+
+    def cyborg_plugin_config
+      plugin_config = "gem: '#{gem}'"
+      plugin_config += ",\n  engine: '#{engine}'" if engine
+      plugin_config
     end
 
     # Add engine's app assets and utilities
     def engine_app_scaffold
 
       # Add asset dirs
-      %w(images javascripts stylesheets svgs).each do |path|
-        path = "#{name}/app/assets/#{path}/#{name}"
-        FileUtils.mkdir_p path
-        FileUtils.touch File.join(path, '.keep')
-        action_log "create", path
-      end
+      files = %w(images javascripts stylesheets svgs).map { |path|
+        "#{gem}/app/assets/#{path}/#{namespace}/.keep"
+      }
+
+      write_file(files, '')
 
       # Add helper and layout dirs
-      %w(helpers views/layouts).each do |path|
-        path = "#{name}/app/#{path}/#{name}"
-        FileUtils.mkdir_p path
-        action_log "create", path
-      end
+      files = %w(helpers views/layouts).each { |path|
+        "#{gem}/app/#{path}/#{namespace}"
+      }
+
+      write_file(files, '')
 
       # Add an application helper
-      File.open("#{name}/app/helpers/#{name}/application_helper.rb", 'w') do |io|
-        io.write %Q{module #{@module_name}
+      write_file("#{gem}/app/helpers/#{namespace}/application_helper.rb", %Q{module #{plugin_module}
   module ApplicationHelper
   end
-end}
-        action_log "create", "#{name}/app/helpers/#{name}/application_helper.rb"
-      end
+end})
 
       # Add an a base layout
-      File.open("#{name}/app/views/layouts/#{name}/application.html.erb", 'w') do |io|
-        io.write %Q{<!DOCTYPE html>
+      write_file("#{gem}/app/views/layouts/#{namespace}/application.html.erb", %Q{<!DOCTYPE html>
 <html>
 <head>
-  <title>#{@module_name}</title>
+  <title>#{plugin_module}</title>
   <%= csrf_meta_tags %>
   <%= asset_tags %>
   <%= yield :stylesheets %>
@@ -131,12 +123,11 @@ end}
   <div class='page'><%=yield %></div>
 </div>
 </body>
-</html>}
-      end
-      action_log "create", "#{name}/app/views/layouts/#{name}/application.html.erb"
+</html>})
 
-      File.open("#{name}/.gitignore", 'a') do |io|
-        io.write %Q{.DS_Store
+
+      # Update .gitignore
+      write_file("#{gem}/.gitignore", %Q{.DS_Store
 log/*.log
 pkg/
 node_modules
@@ -144,15 +135,13 @@ site/log/*.log
 site/tmp/
 /public/
 _svg.js
-.sass-cache}
-      end
-      action_log "update", "#{name}/.gitignore"
+.sass-cache}, 'a')
     end
 
     def engine_site_scaffold
-      FileUtils.mkdir_p(".#{name}-tmp")
-      Dir.chdir ".#{name}-tmp" do
-        response = Open3.capture3("rails plugin new #{name} --mountable --dummy-path=site --skip-test-unit")
+      FileUtils.mkdir_p(".#{gem}-tmp")
+      Dir.chdir ".#{gem}-tmp" do
+        response = Open3.capture3("rails plugin new #{gem} --mountable --dummy-path=site --skip-test-unit")
         if !response[1].empty?
           puts response[1]
           abort "FAILED: Please be sure you have the rails gem installed with `gem install rails`"
@@ -164,7 +153,7 @@ _svg.js
       site_path = File.join(path, 'site')
       FileUtils.mkdir_p(site_path)
 
-      Dir.chdir ".#{name}-tmp/#{name}" do
+      Dir.chdir ".#{gem}-tmp/#{gem}" do
         %w(app config bin config.ru Rakefile public log).each do |item|
           target = File.join(site_path, item)
 
@@ -174,7 +163,7 @@ _svg.js
 
       end
 
-      FileUtils.rm_rf(".#{name}-tmp")
+      FileUtils.rm_rf(".#{gem}-tmp")
       %w(app/mailers app/models config/database.yml).each do |item|
         FileUtils.rm_rf(File.join(site_path, item))
       end
@@ -183,8 +172,7 @@ _svg.js
     def prepare_engine_site
       site_path = File.join(path, 'site')
 
-      File.open File.join(site_path, 'config/environments/development.rb'), 'w' do |io|
-        io.write %Q{Rails.application.configure do
+      write_file(File.join(site_path, 'config/environments/development.rb'), %Q{Rails.application.configure do
   config.cache_classes = false
 
   # Do not eager load code on boot.
@@ -197,11 +185,9 @@ _svg.js
   # Print deprecation notices to the Rails logger.
   config.active_support.deprecation = :log
 end
-        }
-      end
+})
 
-      File.open File.join(site_path, 'config/application.rb'), 'w' do |io|
-        io.write %Q{require File.expand_path('../boot', __FILE__)
+      write_file(File.join(site_path, 'config/application.rb'), %Q{require File.expand_path('../boot', __FILE__)
 
 require "rails"
 # Pick the frameworks you want:
@@ -213,40 +199,31 @@ require 'bundler'
 # you've limited to :test, :development, or :production.
 Bundler.require(*Rails.groups)
 
-require '#{name}'
+require '#{gem}'
 require 'sprockets/railtie'
 
 module Site
   class Application < Cyborg::Application
   end
-end}
-      end
+end})
 
-      File.open File.join(site_path, 'config/routes.rb'), 'w' do |io|
-        io.write %Q{Rails.application.routes.draw do
+      write_file(File.join(site_path, 'config/routes.rb'), %Q{Rails.application.routes.draw do
   resources :docs, param: :page, path: ''
-end}
-      end
+end})
 
-      File.open File.join(site_path, 'app/controllers/docs_controller.rb'), 'w' do |io|
-        io.write %Q{class DocsController < ApplicationController
+      write_file(File.join(site_path, 'app/controllers/docs_controller.rb'), %Q{class DocsController < ApplicationController
   def show
     render action: "#\{params[:page]\}"
   end
-end}
-      end
+end})
 
-      File.open File.join(site_path, 'app/views/layouts/application.html.erb'), 'w' do |io|
-        io.write %Q{<%= layout '#{name}' do %>\n<% end %>}
-      end
-      FileUtils.mkdir_p File.join(site_path, 'app/views/docs')
-      File.open File.join(site_path, 'app/views/docs/index.html.erb'), 'w' do |io|
-        io.write %Q{<h1>#{@module_name} Documentaiton</h1>}
-      end
+      write_file(File.join(site_path, 'app/views/layouts/application.html.erb'), "<%= layout do %>\n<% end %>")
+
+      write_file(File.join(site_path, 'app/views/docs/index.html.erb'), "<h1>#{plugin_module} Documentation</h1>")
     end
 
     def update_git
-      Dir.chdir @name do
+      Dir.chdir gem do
         system "git reset"
         system "git add -A"
       end
@@ -261,7 +238,7 @@ require "#{spec.name}/version"
 # Describe your gem and declare its dependencies:
 Gem::Specification.new do |spec|
   spec.name        = "#{spec.name}"
-  spec.version     = #{@module_name}::VERSION
+  spec.version     = #{modulize(gem)}::VERSION
   spec.authors     = #{spec.authors}
   spec.email       = #{spec.email}
   spec.summary     = "Summary of your gem."
@@ -272,7 +249,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "rails", "~> 4.2.6"
-  spec.add_runtime_dependency "megatron"
+  spec.add_runtime_dependency "cyborg"
 
   spec.add_development_dependency "bundler", "~> 1.12"
   spec.add_development_dependency "rake", "~> 10.0"
@@ -280,8 +257,36 @@ end
 }
     end
 
+    def write_file(paths, content, mode='w')
+      paths = [paths].flatten
+      paths.each do |path|
+        if File.exist?(path)
+          type = 'update'
+        else
+          FileUtils.mkdir_p(File.dirname(path))
+          type ='create'
+        end
+
+        File.open path, mode do |io|
+          io.write(content)
+        end
+
+        action_log(type, path)
+      end
+    end
+
     def action_log(action, path)
       puts action.rjust(12).colorize(:green).bold + "  #{path}"
     end
+
+    def modulize(input)
+      input.split('_').collect(&:capitalize).join
+    end
+
+    def underscorize(input)
+      input.gsub(/[A-Z]/) do |char|
+        '_'+char
+      end.sub(/^_/,'').downcase
+    end
   end
 end

data/lib/cyborg/plugin.rb

@@ -1,45 +1,50 @@
 module Cyborg
   class Plugin
-    attr_reader   :module_name, :gem, :engine, :name,
+    attr_reader   :name, :gem, :engine,
                   :stylesheets, :javascripts, :svgs, :destination
 
     def initialize(options)
-      @name            = options.delete(:name) 
-      @module_name     = parent_module.name
-      @gem             = Gem.loaded_specs[@name]
+      @name            = options.delete(:engine).downcase
+      @gem             = Gem.loaded_specs[options.delete(:gem)]
       @maps            = false
       config(options)
       expand_asset_paths
 
       # Store the gem path for access later when overriding root
       parent_module.instance_variable_set(:@gem_path, root)
+      parent_module.instance_variable_set(:@cyborg_plugin_name, name)
       add_assets
+    end
 
-      @engine = create_engine if defined?(Rails)
+    def engine_name
+      @engine.name.sub(/::Engine/,'')
     end
 
     def create_engine
       # Create a new Rails::Engine
-      return parent_module.const_set('Engine', Class.new(Rails::Engine) do
+      @engine = parent_module.const_set('Engine', Class.new(Rails::Engine) do
 
-        def get_plugin_path
-          parent = Object.const_get(self.class.to_s.split('::').first)
-          path = parent.instance_variable_get("@gem_path")
-          Pathname.new path
+        def cyborg_plugin_path
+          parent = Object.const_get(self.class.name.sub(/::Engine/,''))
+          Pathname.new parent.instance_variable_get("@gem_path")
         end
 
         def config
-          @config ||= Rails::Engine::Configuration.new(get_plugin_path)
+          @config ||= Rails::Engine::Configuration.new(cyborg_plugin_path)
         end
 
-        initializer "#{name.to_s.downcase}.static_assets" do |app|
+        engine_name Cyborg.plugin.name
+
+        initializer "#{name}.static_assets" do |app|
           app.middleware.insert_before(::ActionDispatch::Static, ::ActionDispatch::Static, "#{root}/public")
         end
       end)
     end
 
     def parent_module
-      Object.const_get(self.class.to_s.split('::').first)
+      mods = self.class.to_s.split('::')
+      mods.pop
+      Object.const_get(mods.join('::'))
     end
 
     def add_assets
@@ -89,15 +94,15 @@ module Cyborg
 
     def config(options)
       options = {
-        production_asset_root: "/assets/#{@name}",
-        asset_root:    "/assets/#{@name}",
+        production_asset_root: "/assets/#{name}",
+        asset_root:    "/assets/#{name}",
         destination:   "public/",
         root:          @gem.full_gem_path,
         version:       @gem.version.to_s,
         paths: {
-          stylesheets: "app/assets/stylesheets/#{@name}",
-          javascripts: "app/assets/javascripts/#{@name}",
-          svgs:        "app/assets/svgs/#{@name}",
+          stylesheets: "app/assets/stylesheets/#{name}",
+          javascripts: "app/assets/javascripts/#{name}",
+          svgs:        "app/assets/svgs/#{name}",
         }
       }.merge(options)
 

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

@@ -13,7 +13,7 @@ module Cyborg
         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.module_name} -o #{dest}.js -d"
+            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))

data/lib/cyborg/version.rb

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

metadata

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