cyborg 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8be8c78e209edaa778911fe6eb792394e33b58f0
-  data.tar.gz: cc0cb8ae86a6ce4b68a851bcf8593ea38e2823a9
+  metadata.gz: 07256e2ad9fe07490476d23e2c00d348d78a8f7e
+  data.tar.gz: e46a29def80e707128522a6190d069c6704ba78b
 SHA512:
-  metadata.gz: aa46ffe222014a8c92e0cd4eda081b68106cb7ebf80646686751031ec2c9e9f369f910a759cee589a53b867997de1ded3d52e224b22932bdd67c711fd7c1910c
-  data.tar.gz: c92d05d34c5f00cc2ba96f5a1bf96907bf0ab5fbcf1fe0f59a2d3ebc02dde3faf2ffffd46b8585bd7dce87f66f15a249d5c0b5d7f5b39558bf0e149457a58091
+  metadata.gz: 2f0d968eae626ade7d658a0d72b31cce7d563362548f433c1474244b7ebf265b5d583f3ae2fea887a2c103e8757568bf73afdaea26738a2615a24df7f210ce4f
+  data.tar.gz: 77706d396805e4dada36d0cc3283ddaf9fd7f0224f565a3750bf4fc6a341704eb4bd1e58c3a13ccbad4b0cf12111e90cd86e39cbefe0b9c145e07459eb8d3729

data/bin/cyborg

@@ -15,7 +15,7 @@ end
 
 OptionParser.new do |opts|
 
-  options[:help] = ARGV.shift if ARGV.first == 'help'
+  options[:help] = ARGV.shift if %w(help h).include?(ARGV.first)
 
   if ARGV.empty?
     options[:help] = 'help' # show help as default subcommand
@@ -25,28 +25,30 @@ OptionParser.new do |opts|
 
   opts.banner = Cyborg::Help.banner(options[:command])
 
-  if options[:command] == 'new'
+  if %w(n new).include? options[:command]
     options[:name] = next_arg
 
-    opts.on("-f", "--force", "overwrite existing files") do |val|
+    opts.on("-f", "--force", "Overwrite existing files") do |val|
       options[:force] = true
     end
   end
 
-  if options[:command] == 'npm'
-    options[:cli_path] = next_arg || Dir.pwd
+  if %w(s server).include? options[:command]
+    opts.on("-w", "--watch", "Watch assets") do |val|
+      options[:watch] = true
+    end
   end
 
-  if %w(build watch server).include? options[:command]
-    opts.on("-j", "--js", "build javascripts") do |val|
+  if %w(b w s build watch server).include? options[:command]
+    opts.on("-j", "--js", "Build javascripts") do |val|
       options[:select_assets] = true
       options[:js] = true
     end
-    opts.on("-c", "--css", "build css") do |val|
+    opts.on("-c", "--css", "Build css") do |val|
       options[:select_assets] = true
       options[:css] = true
     end
-    opts.on("-s", "--svg", "build svg") do |val|
+    opts.on("-s", "--svg", "Build svg") do |val|
       options[:select_assets] = true
       options[:svg] = true
     end

data/lib/cyborg.rb

@@ -26,60 +26,9 @@ module Cyborg
   end
 
   def patch_rails
-    load_rake_tasks
     load_helpers
   end
 
-  def dispatch(command, *args)
-    @threads = []
-    send(command, *args)
-    @threads.each { |thr| thr.join }
-  end
-
-  def build(options={})
-    puts 'Building…'
-    require File.join(Dir.pwd, rails_path, 'config/application')
-    @threads.concat plugin.build(options)
-  end
-
-  def watch(options={})
-    build(options)
-    require 'listen'
-
-    trap("SIGINT") { 
-      puts "\nCyborg watcher stopped. Have a nice day!"
-      exit! 
-    }
-
-    @threads.concat plugin.watch(options)
-  end
-
-  def server(options={})
-    @threads << Thread.new { Cyborg::Command.from_rails 'rails server' }
-    watch(options)
-  end
-
-  def load_rake_tasks
-    plugin.engine.rake_tasks do
-      namespace :cyborg do
-        desc "Cyborg build task"
-        task :build do
-          Cyborg.dispatch(:build)
-        end
-
-        desc "Watch assets for build"
-        task :watch do
-          Cyborg.dispatch(:watch)
-        end
-
-        desc "Start rails and watch assets for build"
-        task :server do
-          Cyborg.dispatch(:server)
-        end
-      end
-    end
-  end
-
   def load_helpers
     require "cyborg/helpers/asset_helpers"
     require "cyborg/helpers/layout_helpers"

data/lib/cyborg/command.rb

@@ -9,25 +9,51 @@ module Cyborg
     def run(options)
 
       case options[:command]
-      when 'new'
+      when 'new', 'n'
         Scaffold.new(options[:name])
-      when 'npm' 
-        from_root { NPM.setup }
-      when 'build'
-        from_root { Cyborg.dispatch(:build, options) }
-      when 'watch'
-        from_root { Cyborg.dispatch(:watch, options) }
-      when 'server'
-        from_root { Cyborg.dispatch(:server, options) }
-      when 'rails'
-        from_rails "rails s"
+      when 'build', 'b'
+        from_root { dispatch(:build, options) }
+      when 'watch', 'w'
+        from_root { dispatch(:watch, options) }
+      when 'server', 's'
+        from_root { dispatch(:server, options) }
       else
         puts "Command `#{options[:command]}` not recognized"
       end
     end
 
-    def load_rails
+    # Handles running threaded commands
+    #
+    def dispatch(command, *args)
+      @threads = []
+      send(command, *args)
+      @threads.each { |thr| thr.join }
+    end
+
+    # Build assets
+    def build(options={})
+      puts 'Building…'
       require File.join(Dir.pwd, Cyborg.rails_path, 'config/application')
+      @threads.concat Cyborg.plugin.build(options)
+    end
+
+    # Watch assets for changes and build
+    def watch(options={})
+      build(options)
+      require 'listen'
+
+      trap("SIGINT") { 
+        puts "\nCyborg watcher stopped. Have a nice day!"
+        exit! 
+      }
+
+      @threads.concat Cyborg.plugin.watch(options)
+    end
+
+    # Run rails server and watch assets
+    def server(options={})
+      @threads << Thread.new { from_rails 'rails server' }
+      watch(options) if options[:watch]
     end
 
     def from_rails(command=nil, &blk)

data/lib/cyborg/command/help.rb

@@ -6,45 +6,49 @@ module Cyborg
       if command.nil?
         <<-HERE
 Commands:
-  #{commands.values.join("\n  ")}
+  #{command_list.map{|c| commands(c.to_sym) }.join("\n  ")}
 
 For help with a specific command, run `cyborg help command`
 
 Options:
         HERE
-      elsif commands[command.to_sym]
-        "\nUsage: #{commands[command.to_sym]}\n\nOptions:\n"
+      elsif commands(command.to_sym)
+        "\nUsage:\n  cyborg #{commands(command.to_sym)}\n\nOptions:\n"
       end
     end
 
-    def commands
-      {
-        new:   new,
-        npm:   npm,
-        build: build,
-        watch: watch,
-        help:  help
-      }
+    def command_list
+      %w(new build watch server help)
     end
 
-    def new
-      "cyborg new project_name   # Create a new Cyborg based project"
+    def commands(command)
+      case command
+      when :new, :n; new
+      when :build, :b; build
+      when :watch, :w; watch
+      when :server, :s; server
+      when :help, :h; help
+      end
     end
 
-    def npm
-      "cyborg npm [path]         # Add NPM dependencies (path: dir with package.json, defaults to '.')"
+    def new
+      "new <project_name>   # Create a new Cyborg project"
     end
 
     def build
-      "cyborg build [options]    # Build assets"
+      "build [options]      # Build assets"
     end
 
     def watch
-      "cyborg watch [options]    # Build assets when files change"
+      "watch [options]      # Build assets when files change"
+    end
+
+    def server
+      "server [options]     # Serve documentation site"
     end
 
     def help
-      "cyborg help [command]     # Show help for a specific command"
+      "help [command]       # Show help for a specific command"
     end
   end
 end

data/lib/cyborg/version.rb

@@ -1,3 +1,3 @@
 module Cyborg
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cyborg
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Brandon Mathis