cuba-bin 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4fe609d5f950f480489f5f6325f8b33a6b687db
-  data.tar.gz: e686dba4ce27e60594116295868840966ffcd424
+  metadata.gz: 312a64509492c565429802098e203099dffb5e12
+  data.tar.gz: 109f742ac789908d251c9a6ff32bb110935d8b9a
 SHA512:
-  metadata.gz: cf3608cd0c1c111364d164b26a7c85ce55342541189f5d9a06c7cf2b34925873a4a6f47c25580b6a0f2859aad0d0153974baf88b1729d82d5108809eda6f4cc0
-  data.tar.gz: c4516fa6331ecada60431c06285aa391cc37f8ae043b401ed84ff3962200ecce9c51dbef7553cd2154d7a08c117d49cc01d9f5e15ace44d04000bc354e88a3ad
+  metadata.gz: dadeea0017b362c2b6733b59326f71a6dae7bd4b7c06f8a4b51b4a1166bc3b30b6b89d0ff8eff30e10e560903e98447610a554d01dde8fc6c4535738758e2cd1
+  data.tar.gz: d2734300ea9f69c7b427397581041633bd13ae08cd774191cb7ee8825265b6654385b0fa676faa97afc7d24e28c7185456d94f297a1d263981e0bc61006d32b0

data/bin/cuba

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 if ARGV.empty?
-  puts "usage: cuba [s *args]"
+  puts "usage: cuba [server (s) *args] [deploy (d) *args]"
   exit
 end
 
@@ -11,6 +11,27 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "cuba/bin"
 require "clap"
 
+ENV['RACK_ENV'] ||= 'development'
+
+env      = '.env'
+rack_env = "#{env}.#{ENV['RACK_ENV']}"
+
+if File.file? rack_env
+  env = rack_env
+elsif !File.file? env
+  env = false
+end
+
+if env
+  File.foreach env do |line|
+    key, value = line.split "="
+    ENV[key] = value.gsub('\n', '').strip
+  end
+end
+
 Clap.run ARGV,
+  "server" => Cuba::Bin.method(:server),
   "s"      => Cuba::Bin.method(:server),
-  "-v"      => -> { puts Cuba::Bin::VERSION }
+  "deploy" => Cuba::Bin.method(:deploy),
+  "d"      => Cuba::Bin.method(:deploy),
+  "-v"     => -> { puts Cuba::Bin::VERSION }

data/lib/cuba/bin.rb

@@ -3,16 +3,32 @@ require "cuba/bin/daemon"
 
 module Cuba::Bin
   unless defined? VERSION
-    VERSION = '0.2.2'
+    VERSION = '0.3.0'
   end
 
   extend self
 
   def server
-    Daemon.new(argv).run
+    Daemon.new.run
   end
 
-  private
+  def deploy
+    if ENV['CUBA_BIN_DEPLOY_PATH']
+      require ENV['CUBA_BIN_DEPLOY_PATH']
+    else
+      %w(config/deploy deploy).each do |file|
+        path = Dir.pwd + "/#{file}.rb"
+
+        if File.file? path
+          break require path
+        end
+      end
+    end
+
+    if defined? Deploy
+      Deploy.new.run
+    end
+  end
 
   def argv
     @args ||= begin

data/lib/cuba/bin/daemon.rb

@@ -1,118 +1,101 @@
 require 'listen'
 
-module Cuba::Bin
-  class Daemon
-    extensions = %w(
-      builder coffee creole css slim erb erubis jbuilder
-      slim mote haml html js styl dom
-      less liquid mab markdown md mdown mediawiki mkd mw
-      nokogiri radius rb rdoc rhtml ru
-      sass scss str textile txt wiki yajl yml
-      env.*
-    ).sort
-
-    DEFAULT_RELOAD_PATTERN      = %r(\.(?:builder #{extensions.join('|')})$)
-
-    DEFAULT_FULL_RELOAD_PATTERN = /^Gemfile(?:\.lock)?$/
-
-    # todo> make configurable
-    IGNORE_PATTERNS             = [/\.direnv/, /\.sass-cache/, /^tmp/]
-
-    attr_accessor :options, :unicorn_args
-    attr_accessor :unicorn_pid
-
-    def initialize(unicorn_args)
-      @unicorn_args = unicorn_args
-      # @options, @unicorn_args = options, unicorn_args
-      @options = {}
-      options[:pattern]       ||= DEFAULT_RELOAD_PATTERN
-      options[:full]          ||= DEFAULT_FULL_RELOAD_PATTERN
-      options[:force_polling] ||= false
-      self
-    end
-
-    def log(msg)
-      $stderr.puts msg
-    end
-
-    def start_unicorn
-      ENV['RACK_ENV'] ||= 'development'
-
-      envs     = {}
-      env      = '.env'
-      rack_env = "#{env}.#{ENV['RACK_ENV']}"
-
-      if File.file? rack_env
-        env = rack_env
-      elsif !File.file? env
-        env = false
+class Cuba
+  module Bin
+    class Daemon
+      extensions = %w(
+        builder coffee creole css slim erb erubis jbuilder
+        slim mote haml html js styl dom
+        less liquid mab markdown md mdown mediawiki mkd mw
+        nokogiri radius rb rdoc rhtml ru
+        sass scss str textile txt wiki yajl yml
+        env.*
+      ).sort
+
+      DEFAULT_RELOAD_PATTERN      = %r(\.(?:builder #{extensions.join('|')})$)
+
+      DEFAULT_FULL_RELOAD_PATTERN = /^Gemfile(?:\.lock)?$/
+
+      # todo> make configurable
+      IGNORE_PATTERNS             = [/\.direnv/, /\.sass-cache/, /^tmp/]
+
+      attr_accessor :options, :unicorn_args
+      attr_accessor :unicorn_pid
+
+      def initialize
+        @unicorn_args = Bin.argv
+        # @options, @unicorn_args = options, unicorn_args
+        @options = {}
+        options[:pattern]       ||= DEFAULT_RELOAD_PATTERN
+        options[:full]          ||= DEFAULT_FULL_RELOAD_PATTERN
+        options[:force_polling] ||= false
+        self
       end
 
-      if env
-        File.foreach env do |line|
-          key, value = line.split "="
-          envs[key] = value.gsub('\n', '').strip
-        end
+      def log(msg)
+        $stderr.puts msg
       end
 
-      @unicorn_pid = Kernel.spawn(envs, 'unicorn', '-c', unicorn_config, *unicorn_args)
-    end
+      def start_unicorn
+        @unicorn_pid = Kernel.spawn('unicorn', '-c', unicorn_config, *unicorn_args)
+      end
 
-    def unicorn_config
-      File.expand_path 'unicorn.conf.rb', File.dirname(__FILE__)
-    end
+      def unicorn_config
+        File.expand_path 'unicorn.conf.rb', File.dirname(__FILE__)
+      end
 
-    # TODO maybe consider doing like: http://unicorn.bogomips.org/SIGNALS.html
-    def reload_everything
-      Process.kill(:QUIT, unicorn_pid)
-      Process.wait(unicorn_pid)
-      start_unicorn
-    end
+      # TODO maybe consider doing like: http://unicorn.bogomips.org/SIGNALS.html
+      def reload_everything
+        Process.kill(:QUIT, unicorn_pid)
+        Process.wait(unicorn_pid)
+        start_unicorn
+      end
 
-    def shutdown
-      listener.stop
-      Process.kill(:TERM, unicorn_pid)
-      Process.wait(unicorn_pid)
-      exit
-    end
+      def shutdown
+        listener.stop
+        Process.kill(:TERM, unicorn_pid)
+        Process.wait(unicorn_pid)
+        exit
+      end
 
-    # tell unicorn to gracefully shut down workers
-    def hup_unicorn
-      log "hupping #{unicorn_pid}"
-      Process.kill(:HUP, unicorn_pid)
-    end
+      # tell unicorn to gracefully shut down workers
+      def hup_unicorn
+        log "hupping #{unicorn_pid}"
+        Process.kill(:HUP, unicorn_pid)
+      end
 
-    def handle_change(modified, added, removed)
-      log "File change event detected: #{{modified: modified, added: added, removed: removed}.inspect}"
+      def handle_change(modified, added, removed)
+        log "File change event detected: #{{modified: modified, added: added, removed: removed}.inspect}"
 
-      if (modified + added + removed).index {|f| f =~ options[:full]}
-        reload_everything
-      else
-        hup_unicorn
+        if (modified + added + removed).index {|f| f =~ options[:full]}
+          reload_everything
+        else
+          hup_unicorn
+        end
       end
-    end
 
-    def listener
-      @listener ||= begin
-        x = Listen.to(Dir.pwd, :relative_paths=>true, :force_polling=> options[:force_polling]) do |modified, added, removed|
-          handle_change(modified, added, removed)
-        end
+      def listener
+        @listener ||= begin
+          x = Listen.to(Dir.pwd, :relative_paths=>true, :force_polling=> options[:force_polling]) do |modified, added, removed|
+            handle_change(modified, added, removed)
+          end
 
-        x.only([ options[:pattern], options[:full] ])
-        IGNORE_PATTERNS.map{|ptrn| x.ignore(ptrn) }
-        x
+          x.only([ options[:pattern], options[:full] ])
+          IGNORE_PATTERNS.map{|ptrn| x.ignore(ptrn) }
+          x
+        end
       end
-    end
 
-    def run
-      that = self
-      Signal.trap("INT") { |signo| that.shutdown }
-      Signal.trap("EXIT") { |signo| that.shutdown }
-      listener.start
-      start_unicorn
+      def run
+        that = self
+        Signal.trap("INT") { |signo| that.shutdown }
+        Signal.trap("EXIT") { |signo| that.shutdown }
+        listener.start
+        start_unicorn
 
-      # And now we just want to keep the thread alive--we're just waiting around to get interrupted at this point.
-      sleep(99999) while true
+        # And now we just want to keep the thread alive--we're just waiting around to get interrupted at this point.
+        sleep(99999) while true
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cuba-bin
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - cj
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-11 00:00:00.000000000 Z
+date: 2014-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cuba