drupid 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8030f123e42767835106890cb4607a65167fd13f
-  data.tar.gz: d77d020f6fdd540b8f25c04d657990ef5663f3d6
+  metadata.gz: 161cc5e1450ec53a00cad14a1859274bc8743f4f
+  data.tar.gz: 93f381ecf0bc8064a2f66b7e16b6783cb9836402
 SHA512:
-  metadata.gz: e8638f29cc4a2b423328628e0f89ea723597d5bfe49e3ae2c4f710a7c40bafc8859e32903bb4b0dc1910897b0a9976742b11def87952d753d8116eaae880418b
-  data.tar.gz: 7f5563fa71d1ff292aa70069cd5a0823b086814e992bbe6795247bf03fb339dfecdb0ad011f94760bea276df8d0d7e384d6b545efc07dda9c27228424e1abc4f
+  metadata.gz: 78722164f1d15b6197779e74774d1850fe73bd5024c6459617a86d1d3085ee172828355c1e398ed5492c6b2190b1108318bd384b10f2be257104fe04be0998ff
+  data.tar.gz: 88d5d9d43ff6eacc12c08180616b256dc5857c8b23dcb95937152cbba9e55e83770c6857470528172057c9adc60ae17080391f49a20a258eef70f1006b8252d9

data/README.md

@@ -9,9 +9,12 @@ Drupid is a better replacement for [Drush](https://github.com/drush-ops/drush) `
 
 ### Release Notes ###
 
-#### Version 1.1.2 (2013/9/1) ####
+#### Version 1.1.3 (2013/9/1) ####
 
-Clean up the gem packaging process and fix a broken dependency in Ruby 1.8.
+- Fixed a broken dependency causing Drupid to fail to install in Ruby 1.8.
+- Cleaned up the gem packaging process.
+- Better debugging messages.
+- Bug fixes.
 
 #### Version 1.1.0 (2013/9/1) ####
 

data/bin/drupid

@@ -166,7 +166,7 @@ module Drupid
       '.lock' != @updater.makefile.path.extname
         @updater.makefile.save(@updater.makefile.path.sub_ext('.make.lock'))
       end
-      if (not failed) and @options[:updatedb]
+      if (not failed) and (not @options[:dry]) and @options[:updatedb]
         if which('drush').nil?
           owarn 'Not updating the database because Drush cannot be found.'
         elsif @updater.updatedb
@@ -255,6 +255,7 @@ module Drupid
     def go!
       preflight_dependencies
       parse_options
+      debug USER_AGENT
       ohai "Dry run" if @options[:dry]
       case @options[:command]
       when :clear then clear_cache

data/drupid.gemspec

@@ -24,8 +24,7 @@ Gem::Specification.new do |gem|
 
   # Dependencies
   gem.add_runtime_dependency 'rgl', ['>= 0.4.0']
-  nokogiri_version = (RUBY_VERSION < '1.9') ? '= 1.5.9' : '>= 1.6.0'
-  gem.add_runtime_dependency 'nokogiri', [nokogiri_version]
+  gem.add_runtime_dependency 'nokogiri', ['= 1.5.9']
   gem.add_development_dependency 'minitest', ['>= 5.0.6']
   gem.add_development_dependency 'rdoc', ['>= 0']
 end

data/lib/drupid/drush.rb

@@ -33,7 +33,11 @@ module Drupid
       FileUtils.cd(path) do
         output = %x|drush core-status --format=yaml|
       end
-      st = YAML.load(output)
+      begin # See self.installed?
+        st = YAML.load(output)
+      rescue Exception
+        return false
+      end
       return false unless st
       return (st['bootstrap'] =~ /Successful/) ? true : false
     end
@@ -55,7 +59,13 @@ module Drupid
         output = %x|drush pm-info --format=yaml #{project_name} 2>&1|
         return false unless $?.success? # site not fully bootstrapped
       end
-      st = YAML.load(output)
+      # If a project is not found, Drush does *not* return a YAML structure,
+      # so we need to catch exceptions here.
+      begin
+        st = YAML.load(output)
+      rescue Exception
+        return false
+      end
       return false unless st.has_key?(project_name)
       type = st[project_name]['type']
       status = st[project_name]['status']

data/lib/drupid/patch.rb

@@ -42,8 +42,9 @@ module Drupid
       blah "Fetching patch..."
       begin
         curl @url.to_s, '-o', dst
-      rescue
+      rescue => ex
         raise "Patch #{File.basename(@url.to_s)} could not be fetched."
+        debug ex.message
       end
       @cached_location = dst
       debug "Patch downloaded into #{@cached_location}"

data/lib/drupid/project.rb

@@ -356,9 +356,9 @@ module Drupid
           @release_xml = Nokogiri::XML(open("http://updates.drupal.org/release-history/#{self.name}/#{self.core}"))
         end
         debug "Release history retrieved"
-      rescue Exception
+      rescue => ex
         owarn "Could not get release history for #{self.extended_name}"
-        blah e
+        debug "fetch_release_history: #{ex}"
         @release_xml = nil
       end
     end
@@ -499,7 +499,7 @@ module Drupid
           self.download_url = "http://git.drupal.org/project/#{name}.git"
         end
         self.update_download_url if self.download_url.nil?
-        raise "No download URL specified for #{self.extended_name}" unless self.download_url
+        raise "No download URL defined for #{self.extended_name}" unless self.download_url
         downloader = Drupid.makeDownloader  self.download_url.to_s,
                                             self.cached_location.dirname.to_s,
                                             self.cached_location.basename.to_s,

data/lib/drupid/updater.rb

@@ -388,7 +388,8 @@ module Drupid
       begin
         component.fetch
       rescue => ex
-        @log.error("#{component.extended_name} could not be fetched: #{ex.message}")
+        @log.error("#{component.extended_name} could not be fetched.")
+        debug "_fetch_and_patch: #{ex.message}"
         return false
       end
       if component.has_patches?

data/lib/drupid/utils.rb

@@ -301,8 +301,11 @@ module Drupid
     def dont_debug
       saved_debug = $DEBUG
       $DEBUG = false
-      yield
-      $DEBUG = saved_debug
+      begin
+        yield
+      ensure
+        $DEBUG = saved_debug
+      end
     end
 
   end # Utils

data/lib/drupid/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: drupid
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Lifepillar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-01 00:00:00.000000000 Z
+date: 2013-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rgl
@@ -28,16 +28,16 @@ dependencies:
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.5.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.5.9
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement