drupid 1.1.0 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a929de2a2d0b7af58b9721bfbbcca432d7a4c89
-  data.tar.gz: b34541cadc20ec1c9ec0fc56ae739c9350ccd67b
+  metadata.gz: 8030f123e42767835106890cb4607a65167fd13f
+  data.tar.gz: d77d020f6fdd540b8f25c04d657990ef5663f3d6
 SHA512:
-  metadata.gz: 4f4b0a07712d7a4d42f812696392c09b4420b873f36efddbf9862bc85bd8455ffeacc5e205daa3f80fc03686faa624d83302d230ae11b47dd332f8acef5977ff
-  data.tar.gz: 4a9445e9f04fb27f411e4ab4b990dfc735a7b3035a0a5e745816387d114e195da9da896800a29b97c0ecf44de3476df246c6677313adb0e230814fbf45f140f7
+  metadata.gz: e8638f29cc4a2b423328628e0f89ea723597d5bfe49e3ae2c4f710a7c40bafc8859e32903bb4b0dc1910897b0a9976742b11def87952d753d8116eaae880418b
+  data.tar.gz: 7f5563fa71d1ff292aa70069cd5a0823b086814e992bbe6795247bf03fb339dfecdb0ad011f94760bea276df8d0d7e384d6b545efc07dda9c27228424e1abc4f

data/.bundle/config

@@ -0,0 +1,3 @@
+---
+BUNDLE_PATH: .bundle
+BUNDLE_DISABLE_SHARED_GEMS: '1'

data/.gitignore

@@ -0,0 +1,10 @@
+.DS_Store
+Gemfile.lock
+/pkg/drupid-*.gem
+/.bundle/*
+!/.bundle/config
+/bin/*
+!/bin/drupid
+/doc/
+/test/makefiles/*
+!/test/makefiles/*.make

data/.rbenv-version

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

data/Gemfile

@@ -0,0 +1,3 @@
+source 'https://rubygems.org/'
+
+gemspec

data/README.md

@@ -0,0 +1,56 @@
+## Drupid
+
+_The not-so-smart Drupal updater that keeps your Drupal platform in sync with a Drush makefile!_
+
+Drupid is a better replacement for [Drush](https://github.com/drush-ops/drush) `make`. Drupid does not only build a Drupal platform based on a makefile: it **synchronizes** a Drupal's platform with a makefile!
+
+[![Gem Version](https://badge.fury.io/rb/drupid.png)](http://badge.fury.io/rb/drupid)
+
+
+### Release Notes ###
+
+#### Version 1.1.2 (2013/9/1) ####
+
+Clean up the gem packaging process and fix a broken dependency in Ruby 1.8.
+
+#### Version 1.1.0 (2013/9/1) ####
+
+- Drush is no more a required dependency. Drush is now used only for database-related operations, but Drupid will work even if Drush is not found. When Drush is not installed, downgrading a project always requires `--force`.
+- Added a `--updatedb` option to automatically update Drupal's database after a successful synchronization. If Drush is not installed, this option has no effect.
+- The logic of choosing the best candidate for an update has been changed. Instead of relying on Drush's “recommended” and “supported” releases, Drupid now implements its own method. In general, Drupid will always prefer stable releases (whose version does not contain any extra part) over anything else. So, for example, if a project has version 1.1 and version 2.0-rc1, Drupid will consider 1.1 better (i.e., more stable) than 2.0-rc1, even if 2.0-rc1 is the recommended release. One can always choose a specific version in the makefile, of course. See `Drupid::Version#better` for the details.
+- Overall improvement of Drupid's output messages.
+- Fixed bugs in parsing Drush output by using the YAML format (tested with Drush 6.0).
+- Drupid should now always exit with exit code 1 upon failure.
+- Lots of other bug fixes.
+
+
+#### Version 1.0.2 (2013/8/26) ####
+
+Tested compatibility with Ruby 2.0.
+
+#### Version 1.0.1 (2012/11/5) ####
+
+Fixed a bug causing a “Can't convert Pathname to String” error in some Ruby variants (e.g., 1.9.1-p243).
+
+#### Version 1.0.0 ####
+
+First public release.
+
+
+### How To Run The Tests ###
+
+To run the whole test suite:
+
+    bundle exec rake test
+
+To run a single test file:
+
+    bundle exec ruby -Itest -Ilib test/test_<name>.rb
+
+or
+
+    bundle exec rake test TEST='test/test_<name>.rb'
+
+To run a single test:
+
+    ruby -Itest -Ilib test/test_NAME.rb --name '<test method name>'

data/Rakefile

@@ -0,0 +1,26 @@
+# -*- encoding: utf-8 -*-
+require 'bundler/gem_tasks'
+require 'rake/testtask'
+begin; require 'rdoc/task'; rescue LoadError; end
+
+Rake::TestTask.new do |t|
+  t.verbose = false
+  t.warning = false # Set to true to turn on warnings *and* set $VERBOSE = true
+  t.libs << 'test'
+  t.pattern = 'test/**/test_*.rb'
+end
+
+# Documentation
+begin
+RDoc::Task.new(:rdoc => "doc", :clobber_rdoc => "doc:clean", :rerdoc => "doc:force") do |rd|
+  rd.rdoc_dir = 'doc'
+  rd.main = 'README.md'
+  rd.rdoc_files.include('README.md')
+  rd.rdoc_files.include('lib/**/*.rb')
+  rd.title = 'Drupid'
+end
+rescue
+end
+
+desc "Run tests"
+task :default => :test

data/bin/drupid

@@ -46,7 +46,6 @@ module Drupid
     end
 
     def preflight_dependencies
-      odie 'Drupid requires Ruby 1.8.7 or later' if RUBY_VERSION < '1.8.7'
       ['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."
@@ -86,7 +85,6 @@ module Drupid
           o.on('-g', '--graph', 'Generate a dependency graph and exit.') { @options[:command] = :graph }
           o.on('-h', '--help', 'Print help and exit.') {
             puts o
-            puts "\nGleefully brought to you by Lifepillar! http://lifepillar.com"
             exit 0
           }
           o.on('-l', '--no-libs', 'Do not synchronize libraries.') { @options[:nolibs] = true }
@@ -100,7 +98,7 @@ module Drupid
           '(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.on('-V', '--version', 'Print version and exit.') { puts USER_AGENT; exit 0 }
           o.parse!
         end
       rescue OptionParser::InvalidOption, OptionParser::AmbiguousOption => ex

data/drupid.gemspec

@@ -0,0 +1,31 @@
+# -*- encoding: utf-8 -*-
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'drupid/version'
+
+Gem::Specification.new do |gem|
+  gem.name          = 'drupid'
+  gem.required_ruby_version = '>= 1.8.7'
+  gem.version       = Drupid::VERSION
+  gem.license     = 'MIT'
+  gem.authors       = ['Lifepillar']
+  gem.email         = 'lifepillar@lifepillar.com'
+  gem.description   = 'Drupid keeps a Drush makefile in sync with a Drupal distribution.'
+  gem.summary       = 'The not-so-smart Drupal bundler!'
+  gem.date          = Time.now.strftime('%Y-%m-%d')
+  gem.homepage      = 'http://lifepillar.com'
+
+  gem.files         = `git ls-files`.split($/)
+  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
+  gem.require_paths = ['lib']
+  gem.has_rdoc      = true
+  gem.rdoc_options << '--title' << 'Drupid' << '--line-numbers'
+
+  # 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_development_dependency 'minitest', ['>= 5.0.6']
+  gem.add_development_dependency 'rdoc', ['>= 0']
+end

data/lib/drupid/project_version.rb

@@ -0,0 +1,276 @@
+# -*- coding: utf-8 -*-
+
+# 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
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# 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.
+
+module Drupid
+
+  class NotDrupalVersionError < RuntimeError
+  end
+
+  # Represents the core attribute of a version object (e.g., '7.x').
+  # A VersionCore object can be initialized from a number, a string,
+  # a Drupid::VersionCore object or a Drupid::Version object.
+  #
+  # Examples:
+  #  core = Drupid::VersionCore.new '8.x'
+  #  core = Drupid::VersionCore.new '8'
+  #  core = Drupid::VersionCore.new '8.x-1.0'
+  #  core = Drupid::VersionCore.new 8
+  #  core = Drupid::VersionCore.new(Drupid::Version.new(8, '1.0'))
+  class VersionCore
+    include Comparable
+
+    attr :core
+
+    def initialize spec
+      if spec.is_a?(String)
+        spec.strip.match(/^(\d+)(\.x)?($|-)/)
+        raise NotDrupalVersionError, "Wrong core specification: #{core}" unless $1
+        @core = $1.to_i
+      elsif spec.is_a?(Version)
+        @core = spec.core.to_i
+      elsif spec.is_a?(VersionCore)
+        @core = spec.to_i
+      elsif spec.is_a?(Numeric)
+        @core = spec.to_i # to_i truncates a Float object (so that 7.9 correctly becomes 7)
+      else
+        raise NotDrupalVersionError, "Wrong core specification: #{core}"
+      end
+    end
+
+    # Returns the core number as a string, e.g., '8.x'.
+    def to_s
+      @core.to_s + '.x'
+    end
+
+    # Returns the core number as a Fixnum object.
+    def to_i
+      @core
+    end
+
+    def <=>(other)
+      @core <=> other.core
+    end
+  end
+
+  # Represents a project's version. A version has the form:
+  #   <core>.x-<major>.<patch level>[-<extra>]
+  # Examples of versions include: '7.x-1.0', '7.x-1.2-beta2', '8.x-1.x-dev'.
+  #
+  # See also: http://drupal.org/node/467026
+  class Version
+    include Comparable
+    # The core number, e.g., in 7.x-3.2.beta1, it is 7.
+    attr :core
+    # The major version number, e.g., in 7.x-3.2-beta1, it is 3 (Fixnum).
+    attr :major
+    # The patch level, e.g., in 7.x-3.2-beta1, it is 2 (Fixnum).
+    attr :patchlevel
+    # The project's type, which is one of the constants UNSTABLE,
+    # ALPHA, BETA, RC, DEVELOPMENT, EMPTY or UNKNOWN.
+    # For example, for 7.x-3.2-beta1, it is BETA.
+    attr :extra_type
+    # The numeric part of the extra description, e.g., 7.x-3.2-beta1, it is 1 (Fixnum).
+    attr :extra_num
+
+    UNKNOWN     = -1
+    DEVELOPMENT = 1
+    UNSTABLE    = 2
+    ALPHA       = 4
+    BETA        = 8
+    RC          = 16
+    EMPTY       = 32
+
+    def initialize(core_num, v)
+      raise 'Drupal version is not a string.' unless v.is_a?(String)
+      @core = Drupid::VersionCore.new(core_num)
+      @major = v.match(/^(\d+)/)[1].to_i
+      @patchlevel = $~.post_match.match(/\.(\d+|x)/)[1]
+      @patchlevel = @patchlevel.to_i if 'x' != @patchlevel
+      @extra_string = ''
+      encode_extra($~.post_match) # Initialize @extra_type and @extra_num
+    end
+
+    # Builds a Drupid::Version object from a string, e.g., '8.x-2.0rc1'.
+    def self.from_s v
+      if v.match(/^(\d+)\.x-(\d+.+)$/)
+        Version.new($1.to_i, $2)
+      else
+        raise NotDrupalVersionError, "Cannot build a version from this string: #{v}"
+      end
+    end
+
+    # Returns true if this version represents a development snapshot;
+    # returns false otherwise.
+    def development_snapshot?
+      'x' == @patchlevel or DEVELOPMENT == @extra_type
+    end
+
+    # Returns true if this a stable version (e.g., '8.x-1.0').
+    def stable?
+      EMPTY == @extra_type and 'x' != @patchlevel
+    end
+
+    # Returns true if this is a release candidate (e.g., '8.x-1.0-rc1').
+    def release_candidate?
+      RC == @extra_type
+    end
+
+    # Returns true if this is an alpha release (e.g., '8.x-1.0-alpha1').
+    def alpha?
+      ALPHA == @extra_type
+    end
+
+    # Returns true if this is a beta release (e.g., '8.x-1.0-beta1').
+    def beta?
+      BETA == @extra_type
+    end
+
+    # A synonym for self.short.
+    def to_s
+      short
+    end
+
+    # Returns a short textual representation of this version, e.g., '3.2'.
+    def short
+      xtr = extra()
+      xtr = '-' + xtr if '' != xtr
+      @major.to_s + '.' + @patchlevel.to_s + xtr
+    end
+
+    # Returns the full textual representation of this version, e.g., '7.x-3.2'.
+    def long
+      xtr = extra()
+      xtr = '-' + xtr if '' != xtr
+      @core.to_s + '-' + @major.to_s + '.' + @patchlevel.to_s + xtr
+    end
+
+    # In Ruby 1.8.7, some equality tests fail with the following message:
+    #   No visible difference.
+    #   You should look at your implementation of ==.
+    # if only <=> is defined. This is why we define == explicitly.
+    def ==(other)
+      @core == other.core and
+      @major == other.major and
+      @patchlevel == other.patchlevel and
+      @extra_type == other.extra_type and
+      @extra_num == other.extra_num
+    end
+
+    # Compares two versions according the their "natural" ordering.
+    #
+    # According to this ordering, '1.x-dev' < '1.0-unstable6' <
+    # '1.0-alpha4' < '1.0-beta0' < '1.0-rc1' < '1.0' <'2.x-dev'.
+    def <=>(w)
+      c = @core <=> w.core
+      if 0 == c
+        c = @major <=> w.major
+        if 0 == c
+          c = @patchlevel <=> w.patchlevel
+          case c
+          when nil # e.g., 1 vs 'x'
+            c = ('x' == @patchlevel) ? -1 : 1
+          when 0
+            c = @extra_type <=> w.extra_type
+            if 0 == c
+              c = @extra_num <=> w.extra_num
+            end
+          end
+        end
+      end
+      c
+    end
+
+    # Compares two versions to determine which is "better".
+    # Returns -1 if self is better than w, 0 when they are
+    # the same equivalent, 1 when w is better than w.
+    #
+    # By our own definitions, stable versions (e.g., '1.0') are
+    # better than release candidates (e.g., ('1.1-rc1'), which are
+    # better than beta releases (e.g., '1.2-beta2'), which are better than
+    # alpha releases (e.g., '1.3-alpha1'), which are better than
+    # unstable releases (e.g., '1.4-unstable10'), which are better
+    # than development snapshots (e.g., '2.x-dev'), which are better
+    # than anything else (e.g., '3.x').
+    def better(w)
+      if ('x' == @patchlevel and EMPTY == @extra_type) or (EMPTY == w.extra_type and 'x' == w.patchlevel)
+        c = (self <=> w)
+      else
+        c = @extra_type <=> w.extra_type
+        if 0 == c
+          c = (self <=> w)
+        end
+      end
+      c
+    end
+
+    def extra
+      case @extra_type
+        when EMPTY then t = ''
+        when UNSTABLE then t = 'unstable'
+        when ALPHA then t = 'alpha'
+        when BETA then t = 'beta'
+        when RC then t = 'rc'
+        when DEVELOPMENT then t = 'dev'
+      else # unknown
+        t = @extra_string
+      end
+      if UNKNOWN == @extra_num
+        t
+      else
+        t + @extra_num.to_s
+      end
+    end
+
+    private
+
+    def encode_extra(e)
+      @extra_string = e.start_with?('-') ? e.sub(/-/, '') : e
+      if e.match(/dev(\d*)$/)
+        @extra_type = DEVELOPMENT
+        @extra_num = ($~[1] == '') ? UNKNOWN : $~[1].to_i
+        return
+      end
+      e.match(/^-{0,1}([A-z]*)(\d*)$/)
+      if nil != $~
+        t = $~[1]
+        n = $~[2]
+        case t
+        when /^$/       then @extra_type = EMPTY
+        when /dev/      then @extra_type = DEVELOPMENT
+        when /unstable/ then @extra_type = UNSTABLE
+        when /alpha/    then @extra_type = ALPHA
+        when /beta/     then @extra_type = BETA
+        when /rc/       then @extra_type = RC
+        else
+          @extra_type = UNKNOWN
+        end
+        @extra_num = ('' != n) ? n.to_i : UNKNOWN
+      else
+        @extra_type = UNKNOWN
+        @extra_num = UNKNOWN
+      end
+      return
+    end
+
+  end # class Version
+
+end # Drupid

data/lib/drupid/utils.rb

@@ -153,7 +153,7 @@ module Drupid
 
     def curl *args
       curl = Pathname.new(which 'curl')
-      args = ['-qf#LA', DRUPID_USER_AGENT, *args]
+      args = ['-qf#LA', USER_AGENT, *args]
       args << "--insecure" #if MacOS.version < 10.6
       args << "--silent" unless $VERBOSE