drupid 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 161cc5e1450ec53a00cad14a1859274bc8743f4f
-  data.tar.gz: 93f381ecf0bc8064a2f66b7e16b6783cb9836402
+  metadata.gz: d36d42d029249123c34d37c52a7240f536ed8642
+  data.tar.gz: 65a484f094c4f73bce1f3145e452ad0ad007dfd5
 SHA512:
-  metadata.gz: 78722164f1d15b6197779e74774d1850fe73bd5024c6459617a86d1d3085ee172828355c1e398ed5492c6b2190b1108318bd384b10f2be257104fe04be0998ff
-  data.tar.gz: 88d5d9d43ff6eacc12c08180616b256dc5857c8b23dcb95937152cbba9e55e83770c6857470528172057c9adc60ae17080391f49a20a258eef70f1006b8252d9
+  metadata.gz: d2f1d949e284b15295d6f8b56b700dff4d55332887adeb752226904d9a583fd09d87e42c77f12e3066c534e4af75e5e86552ba1b4e50efb24c77886fc3bb2be8
+  data.tar.gz: f93f4558b1dcc52a9f3dabfb5b9199f6bcaa7736f1e615c4da5f8794a46a0d6df07307a93746b9acedc3a749c31858073b9064b821a7094afa950f7d948ef5c5

data/README.md

@@ -9,6 +9,11 @@ Drupid is a better replacement for [Drush](https://github.com/drush-ops/drush) `
 
 ### Release Notes ###
 
+#### Version 1.1.4 (2013/9/2) ####
+
+- Fixed a regression which, in some circumstances, caused an uncaught exception upon checking whether a project is installed.
+- If a local project differs from the cached version, and it must be patched, Drupid shows a [Patched] label instead of the more generic [update].
+
 #### Version 1.1.3 (2013/9/1) ####
 
 - Fixed a broken dependency causing Drupid to fail to install in Ruby 1.8.

data/lib/drupid/drush.rb

@@ -39,6 +39,7 @@ module Drupid
         return false
       end
       return false unless st
+      return false unless st.instance_of?(Hash)
       return (st['bootstrap'] =~ /Successful/) ? true : false
     end
 
@@ -66,6 +67,7 @@ module Drupid
       rescue Exception
         return false
       end
+      return false unless st.instance_of?(Hash)
       return false unless st.has_key?(project_name)
       type = st[project_name]['type']
       status = st[project_name]['status']

data/lib/drupid/updater.rb

@@ -418,7 +418,7 @@ module Drupid
         if diff.empty?
           @log.notice("#{Tty.white}[OK]#{Tty.reset}  #{platform_project.extended_name}#{p}")
         elsif makefile_project.has_patches?
-          log.action(update_action)
+          log.action(UpdateProjectAction.new(platform, makefile_project, :label => 'Patched'))
           log.notice "#{makefile_project.extended_name}#{p} will be patched"
           log.notice(diff.join("\n"))
         else
@@ -432,7 +432,7 @@ module Drupid
       when 1 # upgrade
         log.action(update_action)
       when -1 # downgrade
-        log.action(UpdateProjectAction.new(platform, makefile_project, :downgrade => true))
+        log.action(UpdateProjectAction.new(platform, makefile_project, :label => 'Update'))
         if which('drush').nil?
           if @force_changes
             owarn "Forcing downgrade."
@@ -589,19 +589,18 @@ module Drupid
 
 
     class UpdateProjectAction < AbstractAction
-      def initialize p, proj, opts = { :downgrade => false }
+      def initialize p, proj, opts = { :label => 'Update' }
         raise "#{proj.extended_name} does not exist locally" unless proj.exist?
         raise "Unknown type for #{proj.extended_name}" unless proj.proj_type
-        @downgrade = opts[:downgrade]
+        @label = opts[:label]
         super(p, proj)
       end
 
       def msg
-        label = 'Update'
         if old_project = platform.get_project(component.name)
-          "#{Tty.blue}[#{label}]#{Tty.white}  #{component.name}: #{old_project.version.long} => #{component.version.long}#{Tty.reset} (#{platform.dest_path(component)})"
+          "#{Tty.blue}[#{@label}]#{Tty.white}  #{component.name}: #{old_project.version.long} => #{component.version.long}#{Tty.reset} (#{platform.dest_path(component)})"
         else
-          "#{Tty.blue}[#{label}]#{Tty.white}  #{component.name}: => #{component.version.long}#{Tty.reset} (#{platform.dest_path(component)})"
+          "#{Tty.blue}[#{@label}]#{Tty.white}  #{component.name}: => #{component.version.long}#{Tty.reset} (#{platform.dest_path(component)})"
         end
       end
 

data/lib/drupid/version.rb

@@ -1,4 +1,4 @@
 module Drupid
-  VERSION = '1.1.3'
+  VERSION = '1.1.4'
   USER_AGENT = "Drupid #{VERSION} (Ruby #{RUBY_VERSION}-#{RUBY_PATCHLEVEL}; #{RUBY_PLATFORM})"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: drupid
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - Lifepillar