drupid 1.0.1 → 1.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 3a929de2a2d0b7af58b9721bfbbcca432d7a4c89
+  data.tar.gz: b34541cadc20ec1c9ec0fc56ae739c9350ccd67b
+SHA512:
+  metadata.gz: 4f4b0a07712d7a4d42f812696392c09b4420b873f36efddbf9862bc85bd8455ffeacc5e205daa3f80fc03686faa624d83302d230ae11b47dd332f8acef5977ff
+  data.tar.gz: 4a9445e9f04fb27f411e4ab4b990dfc735a7b3035a0a5e745816387d114e195da9da896800a29b97c0ecf44de3476df246c6677313adb0e230814fbf45f140f7

data/bin/drupid

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # -*- coding: utf-8 -*-
 
-# Copyright (c) 2012 Lifepillar
+# Copyright (c) 2012-2013 Lifepillar
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -39,14 +39,15 @@ module Drupid
         :nodeps    => false,
         :nolibs    => false,
         :out       => nil,
-        :site      => nil
+        :site      => nil,
+        :updatedb  => false
       }
       @updater = nil  
     end
 
     def preflight_dependencies
       odie 'Drupid requires Ruby 1.8.7 or later' if RUBY_VERSION < '1.8.7'
-      ['diff','curl','git','drush','mktemp','patch','rsync'].each do |cmd|
+      ['diff','curl','git','mktemp','patch','rsync'].each do |cmd|
         if `which #{cmd} 2>/dev/null`.chomp.empty?
           odie "Drupid requires '#{cmd}', but '#{cmd}' was not found in your PATH."
         end
@@ -61,7 +62,7 @@ module Drupid
           o.banner = "Drupid synchronizes a Drush makefile" +
             " with a Drupal platform, and more!\n" +
             "Usage:\n" +
-            "drupid -s <MAKEFILE> -p <DIRECTORY> [-cdDflnSv]\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" +
@@ -81,7 +82,7 @@ module Drupid
           o.on('-D', '--debug', 'Enable debugging.') { $DEBUG = true; $VERBOSE = true }
           o.on('-e', '--edit [URL]', 'Create patches interactively.',
             'With no URL, edit the current directory.') { |u| @options[:command] = :edit; @options[:edit] = u }
-          o.on('-f', '--force', 'Force completion, even if there are errors.') { |b| @options[:force] = b }
+          o.on('-f', '--force', 'Force completion, even if there are warnings or errors.') { |b| @options[:force] = b }
           o.on('-g', '--graph', 'Generate a dependency graph and exit.') { @options[:command] = :graph }
           o.on('-h', '--help', 'Print help and exit.') {
             puts o
@@ -97,6 +98,7 @@ module Drupid
           end
           o.on('-S', '--site NAME', 'Process the given site.',
           '(For multi-site platforms.)') { |s| @options[:site] = s }
+          o.on('-u', '--updatedb', "Update Drupal's database after a successful sync.") { @options[:updatedb] = true }
           o.on('-v', '--verbose', 'Be verbose.') { $VERBOSE = true }
           o.on('-V', '--version', 'Print version and exit.') { puts DRUPID_USER_AGENT; exit 0 }
           o.parse!
@@ -132,7 +134,7 @@ module Drupid
       rescue => ex
         odie "Could not analyze platform: #{ex}"
       end
-      @updater = Drupid::Updater.new(mf, pl, @options[:site])
+      @updater = Drupid::Updater.new(mf, pl, @options)
       blah 'Syncing (this may take a while)...'
       ohai 'Preflighting changes...'
       @updater.sync(
@@ -166,6 +168,21 @@ 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 which('drush').nil?
+          owarn 'Not updating the database because Drush cannot be found.'
+        elsif @updater.updatedb
+          ohai "Success!"
+        else
+          ofail "Database update failed."
+          failed = true
+        end
+      end
+      if failed
+        exit 1
+      else
+        exit 0
+      end
     end
 
     def clear_cache
@@ -256,6 +273,7 @@ module Drupid
       rescue Interrupt
         puts
         drupid.ohai "Drupid interrupted"
+        exit 1
       rescue => ex
         puts
         drupid.debug 'Backtrace:', ex.backtrace.join("\n")

data/lib/drupid.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (c) 2012 Lifepillar
+# Copyright (c) 2012-2013 Lifepillar
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -38,7 +38,7 @@ module Kernel
 end unless Kernel.respond_to? :silence_warnings
 
 module Drupid
-  DRUPID_VERSION = '1.0.1'
+  DRUPID_VERSION = '1.1.0'
   DRUPID_USER_AGENT = "Drupid #{DRUPID_VERSION} (Ruby #{RUBY_VERSION}-#{RUBY_PATCHLEVEL}; #{RUBY_PLATFORM})"
 end
 

data/lib/drupid/component.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (c) 2012 Lifepillar
+# Copyright (c) 2012-2013 Lifepillar
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -120,9 +120,12 @@ module Drupid
         @local_path = cached_location
         debug "#{extended_name} is cached"
       else
-        raise "No download URL specified for #{extended_name}" unless download_url
+        raise "No download URL specified for #{extended_name}" if download_url.nil?
         blah "Fetching #{extended_name}"
-        downloader = Drupid.makeDownloader download_url.to_s, cached_location.dirname.to_s, cached_location.basename.to_s, download_specs
+        downloader = Drupid.makeDownloader self.download_url.to_s,
+                                           self.cached_location.dirname.to_s,
+                                           self.cached_location.basename.to_s,
+                                           self.download_specs
         downloader.fetch
         downloader.stage
         @local_path = downloader.staged_path
@@ -134,8 +137,8 @@ module Drupid
     def patch
       fetch unless exist?
       return unless has_patches?
-      patched_location.rmtree if patched_location.exist? # Ensure no previous patched copy exists
-      @local_path.ditto patched_location
+      dont_debug { patched_location.rmtree if patched_location.exist? } # Make sure that no previous patched copy exists
+      dont_debug { @local_path.ditto patched_location }
       @local_path = patched_location
       # Download patches
       patched_location.dirname.cd do

data/lib/drupid/download_strategy.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (c) 2012 Lifepillar
+# Copyright (c) 2012-2013 Lifepillar
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -90,7 +90,7 @@ module Drupid
       when %r[^https?://svn\.] then Subversion
       when %r[\.git$] then Git
       when %r[\/] then Curl
-      else Drush
+      else Curl
       end
     end
 
@@ -153,10 +153,9 @@ module Drupid
 
       # Retrieves a file from this object's URL.
       def fetch
-        @tarball_path.rmtree if @tarball_path.exist?
+        dont_debug { @tarball_path.rmtree if @tarball_path.exist? }
         begin
-          debug "Pathname.mkpath may raise harmless exceptions"
-          @dest.mkpath unless @dest.exist?
+          dont_debug { @dest.mkpath }
           _fetch
         rescue Exception => e
           ignore_interrupts { @tarball_path.unlink if @tarball_path.exist? }
@@ -173,8 +172,8 @@ module Drupid
       # Invokes #fetch to retrieve the file if needed.
       def stage wd = @dest
         fetch unless @tarball_path.exist?
-        debug "Pathname.mkpath may raise harmless exceptions"
-        wd.mkpath unless wd.exist?
+        dont_debug { wd.mkpath }
+        debug "Staging into #{wd}"
         target = wd + @tarball_path.basename
         type = @tarball_path.compression_type
         if type
@@ -185,27 +184,31 @@ module Drupid
             if 1 == content.size and content.first.directory?
               src = content.first
               target = wd + src.basename
-              FileUtils.mv src.to_s, wd.to_s, :force => true, :verbose => $DEBUG
+              debug "Moving #{src} into #{wd}"
+              dont_debug { FileUtils.mv src.to_s, wd.to_s, :force => true }
             else # the archive did not have a root folder or it expanded to a file instead of a folder
               # We cannot move the temporary directory we are in, so we copy its content
               src = Pathname.pwd
               target = wd + src.basename
-              target.rmtree if target.exist? # Overwrite
-              target.mkpath
+              dont_debug { target.rmtree if target.exist? } # Overwrite
+              dont_debug { target.mkpath }
               src.ditto target
             end
             debug "Temporary staging target: #{target}"
           end
         elsif wd != @dest
-          FileUtils.mv @tarball_path.to_s, wd.to_s, :force => true, :verbose => $DEBUG
-        end
+          debug "Moving #{@tarball_path} into #{wd}"
+          dont_debug { FileUtils.mv @tarball_path.to_s, wd.to_s, :force => true }
+       end
         if @name and @name != target.basename.to_s
           new_path = target.dirname + @name
-          new_path.rmtree if new_path.exist? # Overwrite
+          dont_debug { new_path.rmtree if new_path.exist? }
+          debug "Renaming from #{target} to #{new_path}"
           File.rename target.to_s, new_path.to_s
           target = target.dirname+@name
         end
         @staged_path = target
+        debug "Staging completed"
       end
   
     private
@@ -226,25 +229,6 @@ module Drupid
 
     end # Curl
 
-
-    class Drush < Curl
-      def initialize url, dest, name, download_specs = {}
-        super
-        @tarball_path = @dest + @name
-      end
-
-      def _fetch
-      output = Drupid::Drush.pm_download url, :destination => dest
-        p = Drupid::Drush.download_path(output)
-        if p
-          @tarball_path = Pathname.new(p).realpath
-        else
-          raise "Download failed for project #{name} (using Drush):\n#{output}"
-        end
-      end
-    end # Drush
-
-
     # Detect and download from Apache Mirror
     class CurlApacheMirror < Curl
       def _fetch
@@ -331,8 +315,8 @@ module Drupid
       # Invokes #fetch to retrieve the file if needed.
       def stage wd = @dest
         fetch unless @clone.exist?
-        debug "Pathname.mkpath may raise harmless exceptions"
-        wd.mkpath unless wd.exist?
+        dont_debug { wd.mkpath }
+        debug "Staging into #{wd}"
         target = wd + @clone.basename
         Dir.chdir @clone do
           if @specs.has_key?('branch')
@@ -388,8 +372,8 @@ module Drupid
 
       def stage wd = @dest
         fetch unless @co.exist?
-        debug "Pathname.mkpath may raise harmless exceptions"
-        wd.mkpath unless wd.exist?
+        dont_debug { wd.mkpath }
+        debug "Staging into #{wd}"
         target = wd + @co.basename
         svn 'export', '--force', @co, target
       end
@@ -449,16 +433,16 @@ module Drupid
 
       def stage wd = @dest
         fetch unless @co.exist?
-        debug "Pathname.mkpath may raise harmless exceptions"
-        wd.mkpath unless wd.exist?
+        dont_debug { wd.mkpath }
+        debug "Staging into #{wd}"
         target = wd + @co.basename
-        FileUtils.cp_r Dir[(@co+"{.}").to_s], target
+        dont_debug { FileUtils.cp_r Dir[(@co+"{.}").to_s], target }
 
         require 'find'
         Find.find(Dir.pwd) do |path|
           if FileTest.directory?(path) && File.basename(path) == "CVS"
             Find.prune
-            FileUtil.rm_r path, :force => true
+            dont_debug { FileUtils.rm_r path, :force => true }
           end
         end
       end
@@ -496,8 +480,8 @@ module Drupid
 
       def stage wd = @dest
         fetch unless @co.exist?
-        debug "Pathname.mkpath may raise harmless exceptions"
-        wd.mkpath unless wd.exist?
+        dont_debug { wd.mkpath }
+        debug "Staging into #{wd}"
         dst = wd + @co.basename
         Dir.chdir @clone do
           #if @spec and @ref

data/lib/drupid/drush.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (c) 2012 Lifepillar
+# Copyright (c) 2012-2013 Lifepillar
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -19,125 +19,23 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
+require 'yaml'
 
 module Drupid
 
   # A wrapper around drush.
-  module Drush extend Drupid::Utils
-
-    DRUSH = `which drush`.strip
-
-    def self.drush *args
-      runBabyRun DRUSH, args
-    end
-
-    # Executes 'drush core-status' at the given path and
-    # returns the output of the command.
-    def self.status path, options = {}
-      output = nil
-      FileUtils.cd(path) do
-        output = drush 'core-status', '--pipe'
-      end
-      output
-    end
-
-    # Executes 'drush pm-releases --all' for the given project and
-    # returns the output of the command.
-    def self.pm_releases project_name, options = {}
-      drush 'pm-releases', '--all', project_name
-    end
-
-    # Parses the output of 'drush pm-releases' and returns
-    # the version of the latest recommended release, or nil
-    # if no such release exists.
-    def self.recommended_release pm_releases_output
-      pm_releases_output.each_line do |l|
-        return $~[1] if (l.match(/^\s*([^\s]+).*Recommended/))
-      end
-      nil
-    end
-
-    # Parses the output of 'drush pm-releases' and returns
-    # the version of the latest supported release, or nil
-    # if no such release exists.
-    def self.supported_release pm_releases_output
-      pm_releases_output.each_line do |l|
-        return $~[1] if (l.match(/^\s*([^\s]+).*Supported/))
-      end
-      nil
-    end
-
-    # Executes 'drush pm-download <project_name>' and
-    # returns the output of the command.
-    # If :working_dir is set to an existing directory, move into that directory before
-    # executing the command.
-    #
-    # Options: source, destination, working_dir
-    def self.pm_download project_name, options = {}
-      args = ['pm-download', '-y']
-      args << "--source=#{options[:source]}" if options[:source]
-      args << "--destination\=#{options[:destination]}" if options[:destination]
-      args << "--variant=profile-only"
-      args << "--verbose" if $VERBOSE
-      args << project_name
-      if options[:working_dir] and File.directory?(options[:working_dir])
-        wd = options[:working_dir]
-      else
-        wd = FileUtils.pwd
-      end
-      output = nil
-      FileUtils.cd(wd) do
-        output = runBabyRun DRUSH, args, :redirect_stderr_to_stdout => true
-      end
-      output
-    end
-
-    # Parses the output of 'drush pm-download' and returns
-    # the path to the downloaded project, or nil
-    # if the path cannot be determined.
-    def self.download_path pm_download_output
-      pm_download_output.match(/^\s*Project.+downloaded to *(.\[.+[\n\r])?\s*(.+)\./)
-      return File.expand_path($~[2]) if $~
-      return nil
-    end
-
-    # Parses the output of 'drush pm-download' and returns
-    # the version of the downloaded project, or nil
-    # if the version cannot be determined.
-    def self.downloaded_version pm_download_output
-      pm_download_output.match(/^\s*Project.+\((.+)\) +downloaded +to/)
-      return $~[1] if $~
-      return nil
-    end
-
-    # Executes 'drush pm-info' at the given path and with an
-    # optional list of projects.
-    # Returns the output of the command.
-    def self.pm_info path, projects = [], options = {}
-      output = nil
-      args = Array.new
-      args << 'pm-info'
-      args << projects.join(' ') unless nil != projects and projects.empty?
-      FileUtils.cd(path) do
-        output = runBabyRun DRUSH, args, :redirect_stderr_to_stdout => true
-      end
-      output
-    end
-
-    # Returns the version of Drupal (e.g., '7.12')
-    # if the given path contains Drupal;
-    # returns nil otherwise.
-    def self.drupal_version path, options = {}
-      st = self.status(path, options)
-      return nil unless st.match(/drupal_version=(\d+\.\d+)/)
-      return $~[1]
-    end
+  module Drush
 
     # Returns true if a Drupal's site is bootstrapped at the given path;
     # returns false otherwise.
     def self.bootstrapped?(path, options = {})
-      st = self.status(path, options)
-      st.match(/drupal_bootstrap=Successful/) ? true : false
+      output = ''
+      FileUtils.cd(path) do
+        output = %x|drush core-status --format=yaml|
+      end
+      st = YAML.load(output)
+      return false unless st
+      return (st['bootstrap'] =~ /Successful/) ? true : false
     end
 
     # Returns true if the project at the given path is an enabled theme
@@ -150,34 +48,28 @@ module Drupid
     #
     # Options: verbose
     def self.installed?(site_path, project_name, project_path, options = {})
-      st = ''
-      begin
-        st = self.pm_info(site_path, [project_name], options)
-      rescue # site not fully bootstrapped
-        return false
+      output = nil
+      FileUtils.cd(site_path) do
+        # Redirect stderr to stdout because we do not want to output
+        # Drush's error messages when Drupid is run in verbose mode.
+        output = %x|drush pm-info --format=yaml #{project_name} 2>&1|
+        return false unless $?.success? # site not fully bootstrapped
       end
-      return false unless st.match(/Path +: +#{project_path}/)
-      return false unless st.match(/Type +: +([^\s]+)/)
-      type = $~[1]
-      return false unless st.match(/Status +: +(.+)$/)
-      project_status = $~[1]
-      ('module' == type and project_status !~ /not installed/) or
-      ('theme'  == type and project_status =~ /^enabled/)
+      st = YAML.load(output)
+      return false unless st.has_key?(project_name)
+      type = st[project_name]['type']
+      status = st[project_name]['status']
+      ('module' == type and status !~ /not installed/) or
+      ('theme'  == type and status =~ /^enabled/)
     end
 
-    # Executes 'drush make' and returns the output of the command.
+    # Runs drush updatedb at the specified path.
     #
-    # Options: contrib_path, nocore, dry, verbose
-    def self.make(makefile, target, options = {})
-      args = Array.new
-      args << 'make'
-      args << '-y'
-      args << '--no-core' if options[:nocore]
-      args << "--contrib-destination=#{options[:contrib_path]}" if options[:contrib_path]
-      args << "--no-patch-txt"
-      args << makefile
-      args << target
-      drush(*args)
+    # Raises a Drupid:ErrorDuringExecution exception if an error occurs.
+    def self.updatedb site_path
+      FileUtils.cd(site_path) do
+        return system 'drush updatedb -y'
+      end
     end
 
   end # module Drush