drupid 1.1.4 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d36d42d029249123c34d37c52a7240f536ed8642
-  data.tar.gz: 65a484f094c4f73bce1f3145e452ad0ad007dfd5
+  metadata.gz: 1dc45daa92f00ed660abef03c9031212b8433d5b
+  data.tar.gz: 972e0442163ec44466742815af5d43840b985e2a
 SHA512:
-  metadata.gz: d2f1d949e284b15295d6f8b56b700dff4d55332887adeb752226904d9a583fd09d87e42c77f12e3066c534e4af75e5e86552ba1b4e50efb24c77886fc3bb2be8
-  data.tar.gz: f93f4558b1dcc52a9f3dabfb5b9199f6bcaa7736f1e615c4da5f8794a46a0d6df07307a93746b9acedc3a749c31858073b9064b821a7094afa950f7d948ef5c5
+  metadata.gz: d0f9595fbf2805230ad0ab97dd5faaaf7952913d57501ad31948b39c70cc26558b66b503cb2e7517d7cfff609bac9cbbf5b3ce744dbbc0ca1c1888fffeb8f0fd
+  data.tar.gz: 5645d7f1ed88561d9db064d4e241e39dc37cec435b8b5b82d50d67e90d3978c57d88d30378f2ba008afb7c6082aa010a86de94ceaa6fe7f222ca704153271448

data/.gitignore

@@ -1,4 +1,5 @@
 .DS_Store
+.rbenv-version
 Gemfile.lock
 /pkg/drupid-*.gem
 /.bundle/*

data/README.md

@@ -9,6 +9,12 @@ Drupid is a better replacement for [Drush](https://github.com/drush-ops/drush) `
 
 ### Release Notes ###
 
+#### Version 1.1.5 (2013/9/3) ####
+
+- Fixed a regression that caused `--edit` to accept only URLs. Now it is possible to use project names again (e.g., `drupid -e drupal-8.x` now works).
+- Various optimizations for `drupid --edit`: in particular, Drupal projects are now cached and temporary folders are not unnecessarily cleaned up. This results in better performance, especially for patching big projects like Drupal itself.
+- Other bug fixes.
+
 #### 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.
@@ -61,4 +67,4 @@ or
 
 To run a single test:
 
-    ruby -Itest -Ilib test/test_NAME.rb --name '<test method name>'
+    bundle exec ruby -Itest -Ilib test/test_NAME.rb --name '<test method name>'

data/bin/drupid

@@ -62,9 +62,9 @@ module Drupid
             " with a Drupal platform, and more!\n" +
             "Usage:\n" +
             "drupid -s <MAKEFILE> -p <DIRECTORY> [-cdDflnSuv]\n" +
-            "drupid --clear-cache [-nv]\n" +
-            "drupid --edit [<URL>] [-v] [-o <FILE>]\n" +
-            "drupid --graph -p <DIRECTORY> [-Sv]\n" +
+            "drupid --clear-cache [-Dnv]\n" +
+            "drupid --edit [<URL>] [-Dv] [-o <FILE>]\n" +
+            "drupid --graph -p <DIRECTORY> [-DSv]\n" +
             "drupid --help\n" +
             "drupid --version"
           o.on('-s', '--spec MAKEFILE', 'Path to a drush .make file.') do |p|
@@ -197,19 +197,40 @@ module Drupid
 
     def patch_interactive
       patch = ''
+      wd = nil
+      cleanup = false
       if @options[:edit]
-        begin
-          tmp = Pathname.new `mktemp -d /tmp/temp_item-XXXXXX`.strip
+        tmp = Pathname.new `mktemp -d /tmp/temp_item-XXXXXX`.strip
+        if @options[:edit] !~ /:\/\// # not a URL
+          begin
+            proj = Project.from_s(@options[:edit])
+          rescue NotDrupalVersionError
+            odie "#{@options[:edit]} is not a valid project name (core version required)."
+          end
+          ohai "Fetching #{proj.extended_name}"
+          begin
+            proj.fetch
+          rescue Exception => ex
+            debug ex.message
+            odie "#{proj.extended_name} could not be fetched."
+          end
+          debug "Copying from #{proj.cached_location} to #{tmp}"
+          dont_debug { wd = proj.cached_location.ditto tmp }
+        else
           dl = Drupid.makeDownloader @options[:edit], tmp, File.basename(@options[:edit])
           ohai "Fetching #{@options[:edit]}"
-          dl.fetch
+          begin
+            dl.fetch
+          rescue Exception => ex
+            debug ex.message
+            odie "Could not fetch #{@options[:edit]}."
+          end
           dl.stage
           wd = dl.staged_path
-        rescue => ex
-          odie "Error retrieving #{@options[:edit]}: #{ex}"
         end
-      else
+      else # Patching in current directory
         wd = Pathname.pwd
+        cleanup = true
       end
       git_repo = (wd + '.git').exist?
       Dir.chdir wd.to_s do
@@ -220,6 +241,7 @@ module Drupid
           end
         else
           begin
+            ohai "Creating Git repo"
             blah "Initializing temporary git repo inside #{wd}"
             git 'init'
             git 'add', '-A'
@@ -234,8 +256,14 @@ module Drupid
           git 'add', '-A'
           patch = git 'diff', '--binary', 'HEAD'
         ensure
-          git 'reset', '--hard'
-          FileUtils.rmtree '.git' unless git_repo
+          if cleanup
+            ohai "Cleaning up"
+            if git_repo
+              git 'reset', '--hard'
+            else
+              FileUtils.rmtree '.git'
+            end
+          end
         end
       end
       # Show/write patch

data/lib/drupid/platform.rb

@@ -190,8 +190,13 @@ module Drupid
       @projects.values.select { |p| p.core_project? }.each { |p| yield p }
     end
 
-    # Creates a PNG image depicting the relationships
+    # Creates an SVG image depicting the relationships
     # among the projects in this platform.
+    #
+    # *Requires*: the <tt>dot</tt> program. Without <tt>dot</tt>,
+    # only a <tt>.dot</tt> file is created, but no SVG image.
+    #
+    # Returns the name of the created file.
     def dependency_graph
       silence_warnings do
         begin
@@ -201,10 +206,6 @@ module Drupid
           odie "Please install the RGL gem with 'gem install rgl'"
         end
       end
-      if `which dot 2>/dev/null`.chomp.empty?
-        owarn "The 'dot' program is required to get an SVG image."
-        owarn "Without it you will only get a .dot file."
-      end
       analyze
       # We use this instead of a dag, because there may be circular dependencies...
       graph = ::RGL::DirectedAdjacencyGraph.new
@@ -223,7 +224,13 @@ module Drupid
           graph.add_edge(p.name, depname)
         end
       end
-      graph.write_to_graphic_file('svg')
+      outfile = graph.write_to_graphic_file('svg')
+      if which('dot').nil?
+        owarn "The 'dot' program is required to get an SVG image."
+        return outfile.sub('.svg','.dot')
+      else
+        return outfile
+      end
     end
 
   private

data/lib/drupid/project.rb

@@ -271,12 +271,39 @@ module Drupid
       super(name)
       @core = VersionCore.new(core_num)
       @core_project = ('drupal' == @name) ? true : nil
-      @version = vers ? Version.from_s(@core.to_s + '-' + vers) : nil
+      @version = (vers.nil? or vers.empty?) ? nil : Version.from_s(@core.to_s + '-' + vers)
       @proj_type = ('drupal' == @name) ? 'drupal' : nil
       @info_file = nil
       @release_xml = nil
     end
 
+    # Creates a new Project instance from the specified string.
+    # Note that the string must at least contain the core version of the project.
+    #
+    # Raises a Drupid::NotDrupalVersionError if the string cannot be parsed.
+    #
+    # Examples:
+    #  proj = Drupid::Project.from_s 'drupal-7.23'
+    #  proj = Drupid::Project.from_s 'drupal-8.x'
+    #  proj = Drupid::Project.from_s 'media-7.x'
+    #  proj = Drupid::Project.from_s 'tao-7.x-3.0-beta4'
+    def self.from_s p
+      matchdata = p.match(/^([^-\/]+)[-\/](\d+.*)$/)
+      raise NotDrupalVersionError if matchdata.nil?
+      name = matchdata[1]
+      vers = nil
+      if ('drupal' == name) and (matchdata[2] =~ /^(\d+)\.(\d+)/) # e.g., drupal-8.0-dev
+        core = $1.to_i
+        vers = matchdata[2]
+      else
+        matchversion = matchdata[2].match(/^(\d+)\.x-?(.*)/)
+        raise NotDrupalVersionError if matchversion.nil?
+        core = matchversion[1].to_i
+        vers = matchversion[2]
+      end
+      Project.new(name, core, vers)
+    end
+
     # Returns true if a version is specified for this project, false otherwise.
     def has_version?
       nil != @version
@@ -332,6 +359,7 @@ module Drupid
     #
     # Retrieves the release information for this project from http://updates.drupal.org.
     def update_download_url
+      return unless self.has_version?
       self.fetch_release_history if @release_xml.nil?
       return if @release_xml.nil?
       if @release_xml.at_xpath('/project/releases/release/files/file/variant').nil?
@@ -355,9 +383,14 @@ module Drupid
         dont_debug do
           @release_xml = Nokogiri::XML(open("http://updates.drupal.org/release-history/#{self.name}/#{self.core}"))
         end
-        debug "Release history retrieved"
+        if @release_xml.at_xpath('/error')
+          debug "No release history for the given project"
+          @relese_xml = nil
+        else
+          debug "Release history retrieved"
+        end
       rescue => ex
-        owarn "Could not get release history for #{self.extended_name}"
+        owarn "Could not fetch release history for #{self.extended_name}"
         debug "fetch_release_history: #{ex}"
         @release_xml = nil
       end

data/lib/drupid/project_version.rb

@@ -99,6 +99,7 @@ module Drupid
     RC          = 16
     EMPTY       = 32
 
+    # Initializes a Version object from a core number and a short version.
     def initialize(core_num, v)
       raise 'Drupal version is not a string.' unless v.is_a?(String)
       @core = Drupid::VersionCore.new(core_num)

data/lib/drupid/updater.rb

@@ -597,10 +597,11 @@ module Drupid
       end
 
       def msg
+        spc = ' ' * [0, 8 - @label.length].max
         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}#{spc}#{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}#{spc}#{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.4'
+  VERSION = '1.1.5'
   USER_AGENT = "Drupid #{VERSION} (Ruby #{RUBY_VERSION}-#{RUBY_PATCHLEVEL}; #{RUBY_PLATFORM})"
 end

data/test/test_drupid_project.rb

@@ -233,6 +233,63 @@ class TestDrupidProject < Minitest::Test
     refute p.has_version?
   end
 
+  def test_project_from_s_1
+    p = Drupid::Project.from_s 'drupal-8.x'
+    assert_instance_of Drupid::Project, p
+    assert_equal 'drupal', p.name
+    assert_equal 8, p.core.to_i
+    refute p.has_version?
+    assert_equal 'drupal', p.proj_type
+  end
+
+  def test_project_from_s_2
+    p = Drupid::Project.from_s 'drupal-7.23'
+    assert_instance_of Drupid::Project, p
+    assert_equal 'drupal', p.name
+    assert_equal 7, p.core.to_i
+    assert p.has_version?
+    assert_equal '7.23', p.version.short
+    assert_equal '7.x-7.23', p.version.long
+    assert_equal 'drupal', p.proj_type
+  end
+
+  def test_project_from_s_3
+    p = Drupid::Project.from_s 'drupal-7.24-dev'
+    assert_instance_of Drupid::Project, p
+    assert_equal 'drupal', p.name
+    assert_equal 7, p.core.to_i
+    assert p.has_version?
+    assert_equal '7.24-dev', p.version.short
+    assert_equal '7.x-7.24-dev', p.version.long
+    assert_equal 'drupal', p.proj_type
+  end
+
+  def test_project_from_s_4
+    p = Drupid::Project.from_s 'media-7.x'
+    assert_instance_of Drupid::Project, p
+    assert_equal 'media', p.name
+    assert_equal 7, p.core.to_i
+    refute p.has_version?
+    assert_nil p.proj_type
+  end
+
+  def test_project_from_s_5
+    p = Drupid::Project.from_s 'tao-7.x-3.0-beta4'
+    assert_instance_of Drupid::Project, p
+    assert_equal 'tao', p.name
+    assert_equal 7, p.core.to_i
+    assert p.has_version?
+    assert_equal '3.0-beta4', p.version.short
+    assert_equal '7.x-3.0-beta4', p.version.long
+    assert_nil p.proj_type
+  end
+
+  def test_project_from_wrong_string
+    assert_raises Drupid::NotDrupalVersionError do
+      Drupid::Project.from_s 'media-2.0-unstable7' # no core version
+    end
+  end
+
   def test_project_version
     p = Drupid::Project.new('foo', 8)
     p.version = '8.x-1.0'

data/test/test_drupid_version.rb

@@ -210,6 +210,9 @@ class TestDrupidVersion < Minitest::Test
     assert_raises Drupid::NotDrupalVersionError do
       Drupid::Version.from_s '1.0' # missing core number (e.g., '7.x-1.0')
     end
+    assert_raises Drupid::NotDrupalVersionError do
+      Drupid::Version.from_s '7.x'
+    end
     assert_raises RuntimeError do
       Drupid::Version.new(7, 1.0)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: drupid
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
 platform: ruby
 authors:
 - Lifepillar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-02 00:00:00.000000000 Z
+date: 2013-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rgl
@@ -75,7 +75,6 @@ extra_rdoc_files: []
 files:
 - .bundle/config
 - .gitignore
-- .rbenv-version
 - Gemfile
 - README.md
 - Rakefile

data/.rbenv-version

@@ -1 +0,0 @@
-2.0.0-p247