hw 1.1.4 → 1.1.5

data/lib/hw.rb

@@ -1,9 +1,7 @@
 require 'git'
 require 'thor'
 require 'thor/group'
-require 'httparty'
-require 'active_support/all'
-require 'rails/generators/actions'
+require 'rails/generators/base'
 
 module HW
   DEFAULT_SOURCE  = "git@github.com:carrot/hw-packages.git" # CLI

data/lib/hw/actions.rb

@@ -27,4 +27,3 @@ module HW::Actions
     create_file("app/workers/#{filename}", data, :verbose => false, &block)
   end
 end
-

data/lib/hw/cli.rb

@@ -29,6 +29,7 @@ module HW
     desc "version", "display gem version information"
     def version
       dependency = Gem::Dependency.new('hw', Gem::Requirement::default)
+      puts Gem::SpecFetcher::fetcher.find_matching(dependency, true, false, false).inspect
       versions = Gem::SpecFetcher::fetcher.find_matching(dependency, true, false, false).collect do |entry|
         if tuple = entry.first
           tuple[1]
@@ -48,6 +49,7 @@ module HW
     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"
 
@@ -59,31 +61,36 @@ module HW
         header "Adding default source to #{CONFIG_PATH}"
 
         create_file CONFIG_PATH
-        invoke :add_source, ["default", DEFAULT_SOURCE]
+        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.
-      HW::Sources.all.each do |name, url|
-        begin
-          path  = "#{SOURCES_PATH}/#{name}"
-          local = HW::Sources.local_source?(url)
+      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
+            unless local
+              if File.exists?(path)
+                Git.open(path).pull
+              else
+                Git.clone(url, name, :path => SOURCES_PATH) unless local
+              end
             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}"
+            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
-        rescue Git::GitExecuteError => e
-          warn "Nothing was pulled from #{url}"
         end
+      else
+        warn "Sources not updated"
+        info "Remove --pull=false to update your sources"
       end
     end
   end

data/lib/hw/version.rb

@@ -1,7 +1,7 @@
 module HW
   MAJOR = 1
   MINOR = 1
-  TINY  = 4
+  TINY  = 5
   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.4
+  version: 1.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-17 00:00:00.000000000 Z
+date: 2013-03-20 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: &70210112888160 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *70210112888160
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70210112887640 !ruby/object:Gem::Requirement
+  requirement: &70133764491000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -35,54 +24,21 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70210112887640
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: &70210112886960 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *70210112886960
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: &70210112886500 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *70210112886500
-- !ruby/object:Gem::Dependency
-  name: httparty
-  requirement: &70210112886080 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *70210112886080
+  version_requirements: *70133764491000
 - !ruby/object:Gem::Dependency
-  name: pg
-  requirement: &70210112885660 !ruby/object:Gem::Requirement
+  name: railties
+  requirement: &70133764490240 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70210112885660
+  version_requirements: *70133764490240
 - !ruby/object:Gem::Dependency
   name: git
-  requirement: &70210112885240 !ruby/object:Gem::Requirement
+  requirement: &70133764489860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -90,84 +46,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70210112885240
-- !ruby/object:Gem::Dependency
-  name: rspec-rails
-  requirement: &70210112884820 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *70210112884820
-- !ruby/object:Gem::Dependency
-  name: ruby-prof
-  requirement: &70210112884400 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *70210112884400
-- !ruby/object:Gem::Dependency
-  name: debugger
-  requirement: &70210112883980 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *70210112883980
-- !ruby/object:Gem::Dependency
-  name: ronn
-  requirement: &70210112883560 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *70210112883560
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: &70210112883060 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.11'
-  type: :development
-  prerelease: false
-  version_requirements: *70210112883060
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: &70210112882640 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *70210112882640
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: &70210112898540 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *70210112898540
+  version_requirements: *70133764489860
 description: Package manager for random tasks
 email: tmilewski@gmail.com
 executables: