hw 1.1.8 → 1.1.9

data/bin/hw

@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+
 $:.unshift(File.expand_path('../../lib', __FILE__))
-require 'hw'
-HW::CLI.start
+
+require 'hw/runner'
+HW::Runner.start

data/lib/hw.rb

@@ -1,21 +1 @@
-require 'git'
-require 'thor'
-require 'thor/group'
-require 'rails'
-require 'rails/generators/base'
-
-module HW
-  DEFAULT_SOURCE  = "git@github.com:carrot/hw-packages.git" # CLI
-  DIRECTORY       = File.expand_path("~/.hw/")              # CLI, HW
-  CONFIG_PATH     = "#{DIRECTORY}/config"                   # CLI, Sources
-  SOURCES_PATH    = "#{DIRECTORY}/sources/"                 # CLI, Packages
-  RESERVED_WORDS  = %w(help)                                # Packages
-end
-
-require 'hw/core_ext/string'
-require 'hw/version'
-require 'hw/actions'
-require 'hw/thor'
-require 'hw/sources'
-require 'hw/packages'
-require 'hw/cli'
+require 'hw/base'

data/lib/hw/actions.rb

@@ -1,49 +1,53 @@
-module HW::Actions
-  def header msg
-    say_status ">>>", "\e[36m#{msg}\e[0m", :cyan
-  end
+class HW
+  module Actions
+    extend Thor::Actions
 
-  def info msg;    say_status "info",    msg, :white;  end
-  def success msg; say_status "success", msg, :green;  end
-  def error msg;   say_status "error",   msg, :red;    end
-  def warn msg;    say_status "warning", msg, :yellow; end
+    def header msg
+      say_status ">>>", "\e[36m#{msg}\e[0m", :cyan
+    end
 
-  def replace_file(destination, data = nil, config = {}, &block)
-    remove_file(destination)
-    create_file(destination, data, config, block)
-  end
+    def info msg;    say_status "info",    msg, :white;  end
+    def success msg; say_status "success", msg, :green;  end
+    def error msg;   say_status "error",   msg, :red;    end
+    def warn msg;    say_status "warning", msg, :yellow; end
 
-  def bundle
-    header "Bundling gems"
-    run "bundle install --quiet"
-  end
+    def replace_file(destination, data = nil, config = {}, &block)
+      remove_file(destination)
+      create_file(destination, data, config, block)
+    end
 
-  def migrate(options={})
-    header "Migrating the database"
-    env = options[:env] || 'development'
-    rake("db:migrate", env: env, silence: true)
-  end
+    def bundle
+      header "Bundling gems"
+      run "bundle install --quiet"
+    end
 
-  def worker filename, data=nil, &block
-    create_file("app/workers/#{filename}", data, verbose: false, &block)
-  end
+    def migrate(options={})
+      header "Migrating the database"
+      env = options[:env] || 'development'
+      rake("db:migrate", env: env, silence: true)
+    end
+
+    def worker filename, data=nil, &block
+      create_file("app/workers/#{filename}", data, verbose: false, &block)
+    end
 
-  def rake(command, options={})
-    env     = options[:env] || 'development'
-    capture = options[:silence] || false
-    sudo    = options[:sudo] ? 'sudo ' : ''
+    def rake(command, options={})
+      env     = options[:env] || 'development'
+      capture = options[:silence] || false
+      sudo    = options[:sudo] ? 'sudo ' : ''
 
-    #run  rake db:create from "./testing"
-    #success
-    run("#{sudo}rake #{command} RAILS_ENV=#{env}", verbose: false, capture: capture)
-  end
+      #run  rake db:create from "./testing"
+      #success
+      run("#{sudo}rake #{command} RAILS_ENV=#{env}", verbose: false, capture: capture)
+    end
 
-  def git(commands={})
-    if commands.is_a?(Symbol)
-      run "git #{commands}"
-    else
-      commands.each do |cmd, options|
-        run "git #{cmd} #{options}"
+    def git(commands={})
+      if commands.is_a?(Symbol)
+        run "git #{commands}"
+      else
+        commands.each do |cmd, options|
+          run "git #{cmd} #{options}"
+        end
       end
     end
   end

data/lib/hw/base.rb

@@ -0,0 +1,35 @@
+require 'git'
+require 'thor'
+require 'thor/group'
+require 'hw/core_ext/string'
+
+class HW < Thor
+  autoload :Actions,  'hw/actions'
+  autoload :Sources,  'hw/sources'
+  autoload :Packages, 'hw/packages'
+  
+  DEFAULT_SOURCE  = "git@github.com:carrot/hw-packages.git"
+  DIRECTORY       = File.expand_path("~/.hw/")
+  CONFIG_PATH     = "#{DIRECTORY}/config"
+  SOURCES_PATH    = "#{DIRECTORY}/sources/"
+  RESERVED_WORDS  = %w(help)
+
+  module Base
+
+    class << self
+      def included(base) # :nodoc:
+        base.send :extend,  ClassMethods
+        base.send :include, Thor::Actions
+        base.send :include, Thor::Shell
+        base.send :include, Actions
+      end
+    end
+
+    module ClassMethods
+      def reserved?(arg)
+        arg = arg.first if arg.kind_of?(Array)
+        Thor::THOR_RESERVED_WORDS.include?(arg) or Thor::HELP_MAPPINGS.include?(arg)
+      end
+    end
+  end
+end

data/lib/hw/packages.rb

@@ -1,51 +1,64 @@
-module HW::Packages
-  extend self
+class HW
+  class Packages
+    extend Thor::Actions
+    extend Thor::Shell
+    extend Actions
 
-  @@packages = {}
+    class << self
+      @@packages = {}
 
-  def add name
-    HW::Sources.all.each do |key, path|
-      full_path = if HW::Sources.local_source?(path)
-        File.join(path, "#{name}.rb")
-      else
-        File.join(HW::SOURCES_PATH, key, "#{name}.rb")
-      end
+      def add name
+        Sources.all.each do |key, path|
+          full_path = if HW::Sources.local_source?(path)
+            File.join(path, "#{name}.rb")
+          else
+            File.join(SOURCES_PATH, key, "#{name}.rb")
+          end
 
-      @@packages[name] = full_path if File.exists?(full_path)
-    end
+          @@packages[name] = full_path if File.exists?(full_path)
+        end
 
-    if reserved?(name)
-      puts "'#{name}' is a reserved word and cannot be defined as a package"
-      exit(1)
-    end
+        if reserved?(name)
+          puts "'#{name}' is a reserved word and cannot be defined as a package"
+          exit(1)
+        end
 
-    register(name, @@packages[name])
-  end
+        register(name, @@packages[name])
+      end
 
-  def register name, file
-    require file
-    klass = HW::Packages::const_get(name.to_pkg)
-    Thor.register(klass, name, "#{name} <command>", "")
-  rescue LoadError, TypeError
-    puts "The package '#{name}' was not found in any of the sources"
-    exit(1)
-  end
+      def register name, file
+        raise LoadError if file.nil? # TODO: Don't use exception handling.
+        require file
+        klass = Packages::const_get(name.to_pkg)
+        Thor.register(klass, name, "#{name} <command>", "")
+      rescue LoadError
+        puts "The package '#{name}' was not found in any of the sources"
+        exit(1)
+      end
 
-  def list
-    HW::Sources.all.keys.each do |directory|
-      full_path = File.join(HW::SOURCES_PATH, directory, "*.rb")
+      def list
+        header "Listing available packages"
 
-      Dir[full_path].each do |file|
-        key             = File.basename(file, '.rb')
-        @@packages[key] = file
+        Sources.all.keys.each do |directory|
+          full_path = File.join(SOURCES_PATH, directory, "*.rb")
+
+          Dir[full_path].each do |file|
+            key             = File.basename(file, '.rb')
+            @@packages[key] = file
+          end
+        end
+
+        @@packages.merge!({ 'system' => nil, 'help' => nil })
+        @@packages.keys.sort
       end
-    end
 
-    @@packages.merge!({ 'system' => nil, 'help' => nil })
-    @@packages.keys.sort
-  end
+      def formatted_list
+        print_in_columns(Packages.list)
+      end
 
-  def reserved? name
-    HW::RESERVED_WORDS.include?(name.downcase)
+      def reserved? name
+        RESERVED_WORDS.include?(name.downcase)
+      end
+    end
   end
 end

data/lib/hw/runner.rb

@@ -0,0 +1,53 @@
+require 'hw/base'
+
+class HW::Runner < HW
+  include Base
+
+  def self.start(given_args = ARGV, config = {})
+    unless self.is_a_reserved_task?(given_args)
+      name = ARGV.first
+
+      if Packages.reserved?(name)
+        Packages.register(name, "hw/packages/#{name}")
+      else
+        Packages.add(name)
+      end
+    end
+
+    super(given_args, config)
+  end
+
+  desc "list", "list available packages"
+  def list
+    Packages.formatted_list
+  end
+
+  desc "add_source <name> <source>", "Add a source to ~/.hw/config"
+  def add_source name, source
+    Sources.add(name, source)
+  end
+
+  desc "update", "Update installed packages"
+  method_option :pull, :aliases => "-p", :type => :boolean, :default => "true",  :desc => "Pull from remote sources"
+  def update
+    header "Updating hw"
+    Sources.ensure_defaults 
+
+    if options["pull"]
+      Sources.fetch
+    else
+      warn "Sources not updated"
+      info "Remove `-p false` to update your sources"
+    end
+  end
+  
+  desc "install", "Update installed packages"
+  method_option :pull, :aliases => "-p", :type => :boolean, :default => "true",  :desc => "Pull from remote sources"
+  alias :install :update
+
+  no_tasks do
+    def self.is_a_reserved_task? args
+      ARGV.empty? or reserved?(args) or self.instance_methods(false).include?(args.first.to_sym)
+    end
+  end
+end

data/lib/hw/sources.rb

@@ -1,38 +1,80 @@
-require 'thor/actions'
+class HW
+  class Sources < Thor
+    extend Thor::Actions
+    extend Thor::Shell
+    extend Actions
 
-module HW::Sources
-  extend self
+    class << self
+      @@sources = {}
 
-  @@sources         = {}
-  @@default_source  = "git@github.com:carrot/hw-packages.git"
+      def all
+        if File.exists? CONFIG_PATH
+          File.readlines(CONFIG_PATH).each do |line|
+            source                = line.split("=")
+            path                  = source[1].strip
+            path                  = File.expand_path(path) if local_source?(path)
+            @@sources[source[0]]  = path
+          end
+        end
 
-  def all
-    if File.exists? HW::CONFIG_PATH
-      File.readlines(HW::CONFIG_PATH).each do |line|
-        source                = line.split("=")
-        path                  = source[1].strip
-        path                  = File.expand_path(path) if local_source?(path)
-        @@sources[source[0]]  = path
+        @@sources
       end
-    end
 
-    @@sources
-  end
+      def add name, source
+        self.destination_root = "."
+        header "Appending #{name} to #{CONFIG_PATH}"
+        append_file CONFIG_PATH, "#{name}=#{source}\n"
+      end
 
-  def add
-    # TODO: Currently a part of the System package
-  end
+      def ensure_defaults
+        empty_directory DIRECTORY     unless File.exists? DIRECTORY
+        empty_directory SOURCES_PATH  unless File.exists? SOURCES_PATH
 
-  def git_clone
-    # TODO: Clone git repo
-  end
+        unless File.exists? CONFIG_PATH
+          header "Adding default source to #{CONFIG_PATH}"
 
-  def git_pull
-    # TODO: Pull changes from git repo
-  end
+          create_file CONFIG_PATH
+          self.class.new.invoke :add_source, ["default", DEFAULT_SOURCE] # self.class.new added else RSpec screws up.    
+        end
+      end
+
+      def fetch
+        self.all.each do |name, url|
+          begin
+            path  = "#{SOURCES_PATH}/#{name}"
+            local = self.local_source?(url)
+
+            unless local
+              if File.exists?(path)
+                Git.open(path).pull
+              else
+                Git.clone(url, name, :path => SOURCES_PATH) unless local
+              end
+            end
 
-  def local_source? path
-    git_regex = /([A-Za-z0-9]+@|http(|s)\:\/\/)([A-Za-z0-9.]+)(:|\/)([A-Za-z0-9\-\/]+)/
-    (path =~ git_regex).nil?
+            if local and !File.exists?(url)
+              error "Local directory '#{url}' not found. Please check your sources at #{CONFIG_PATH}"
+            else
+              success "Successfully pulled updates from #{url} to #{SOURCES_PATH}#{name}"
+            end
+          rescue Git::GitExecuteError => e
+            warn "Nothing was pulled from #{url}"
+          end
+        end
+      end
+
+      def git_clone
+        # TODO: Clone git repo
+      end
+
+      def git_pull
+        # TODO: Pull changes from git repo
+      end
+
+      def local_source? path
+        git_regex = /([A-Za-z0-9]+@|http(|s)\:\/\/)([A-Za-z0-9.]+)(:|\/)([A-Za-z0-9\-\/]+)/
+        (path =~ git_regex).nil?
+      end
+    end
   end
 end

data/lib/hw/version.rb

@@ -1,7 +1,7 @@
-module HW
+class HW
   MAJOR = 1
   MINOR = 1
-  TINY  = 8
+  TINY  = 9
   PRE   = nil
 
   VERSION = [MAJOR, MINOR, TINY, PRE].compact.join('.')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hw
 version: !ruby/object:Gem::Version
-  version: 1.1.8
+  version: 1.1.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-04 00:00:00.000000000 Z
+date: 2013-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -89,11 +89,11 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/hw/actions.rb
-- lib/hw/cli.rb
+- lib/hw/base.rb
 - lib/hw/core_ext/string.rb
 - lib/hw/packages.rb
+- lib/hw/runner.rb
 - lib/hw/sources.rb
-- lib/hw/thor.rb
 - lib/hw/version.rb
 - lib/hw.rb
 - bin/hw
@@ -114,7 +114,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -760293877887696916
+      hash: -3696391133987059405
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -123,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -760293877887696916
+      hash: -3696391133987059405
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25

data/lib/hw/cli.rb

@@ -1,96 +0,0 @@
-module HW
-  class CLI < HW::Thor
-    def self.start(given_args = ARGV, config = {})
-      unless ARGV.empty? or self.instance_methods(false).include?(ARGV.first.to_sym)
-        name = ARGV.first
-
-        if HW::Packages.reserved?(name)
-          HW::Packages.register(name, "hw/packages/#{name}")
-        else
-          HW::Packages.add(name)
-        end
-      end
-
-      super(given_args, config)
-    end
-
-    desc "list", "list available packages"
-    def list
-      header "Listing available packages"
-      Thor::Shell::Basic.new.print_in_columns(HW::Packages.list)
-    end
-
-    desc "add_source <name> <source>", "Add a source to ~/.hw/config"
-    def add_source name, source
-      header "Appending #{name} to #{CONFIG_PATH}"
-      append_file CONFIG_PATH, "#{name}=#{source}\n"
-    end
-
-    desc "version", "display gem version information"
-    def version
-      dependency = Gem::Dependency.new('hw', Gem::Requirement::default)
-      versions = Gem::SpecFetcher::fetcher.find_matching(dependency, true, false, false).collect do |entry|
-        if tuple = entry.first
-          tuple[1]
-        end
-      end
-
-      latest = versions.last.to_s
-
-      if latest != VERSION
-        error "Your version is out of date."
-        info  "Your Version: #{VERSION}"
-        info  "Current Version: #{latest}"
-      else
-        success "Your version is up to date."
-        info  "Your Version: #{VERSION}"
-      end
-    end
-
-    desc "update", "Update installed packages"
-    method_option :pull, :aliases => "-p", :type => :boolean, :default => "true",  :desc => "Pull from remote sources"
-    def update
-      header "Updating hw"
-
-      # Setup File Structure
-      empty_directory DIRECTORY     unless File.exists? DIRECTORY
-      empty_directory SOURCES_PATH  unless File.exists? SOURCES_PATH
-
-      unless File.exists? CONFIG_PATH
-        header "Adding default source to #{CONFIG_PATH}"
-
-        create_file CONFIG_PATH
-        self.class.new.invoke :add_source, ["default", DEFAULT_SOURCE] # self.class.new added else RSpec screws up.
-      end
-
-      # Iterate through sources and take appropriate actions. TODO: Refactor.
-      if options["pull"]
-        HW::Sources.all.each do |name, url|
-          begin
-            path  = "#{SOURCES_PATH}/#{name}"
-            local = HW::Sources.local_source?(url)
-
-            unless local
-              if File.exists?(path)
-                Git.open(path).pull
-              else
-                Git.clone(url, name, :path => SOURCES_PATH) unless local
-              end
-            end
-
-            if local and !File.exists?(url)
-              error "Local directory '#{url}' not found. Please check your sources at #{CONFIG_PATH}"
-            else
-              success "Successfully pulled updates from #{url} to #{SOURCES_PATH}#{name}"
-            end
-          rescue Git::GitExecuteError => e
-            warn "Nothing was pulled from #{url}"
-          end
-        end
-      else
-        warn "Sources not updated"
-        info "Remove --pull=false to update your sources"
-      end
-    end
-  end
-end

data/lib/hw/thor.rb

@@ -1,7 +0,0 @@
-module HW
-  class Thor < ::Thor
-    include Thor::Actions
-    include Rails::Generators::Actions if defined?(Rails)
-    include HW::Actions
-  end
-end