drupid 1.1.0 → 1.1.2

data/lib/drupid/version.rb

@@ -1,276 +1,4 @@
-# -*- 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
+  VERSION = '1.1.2'
+  USER_AGENT = "Drupid #{VERSION} (Ruby #{RUBY_VERSION}-#{RUBY_PATCHLEVEL}; #{RUBY_PLATFORM})"
+end

data/lib/drupid.rb

@@ -19,8 +19,8 @@
 # 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 'fileutils'
+require 'drupid/version'
 require 'drupid/extend/pathname'
 
 # To silence (most) warnings from a required file
@@ -37,16 +37,11 @@ module Kernel
   end
 end unless Kernel.respond_to? :silence_warnings
 
-module Drupid
-  DRUPID_VERSION = '1.1.0'
-  DRUPID_USER_AGENT = "Drupid #{DRUPID_VERSION} (Ruby #{RUBY_VERSION}-#{RUBY_PATCHLEVEL}; #{RUBY_PLATFORM})"
-end
-
 require 'drupid/utils'
 require 'drupid/download_strategy'
 require 'drupid/drush'
 require 'drupid/patch'
-require 'drupid/version'
+require 'drupid/project_version'
 require 'drupid/component'
 require 'drupid/project'
 require 'drupid/library'

data/test/fixtures/drupal-example.make

@@ -0,0 +1,89 @@
+core = 7.x
+api = 2
+projects[drupal][version] = 7.8
+
+; **Project with no further options:**
+projects[] = views
+
+; **Project using options (see below):**
+projects[ctools][version] = 1.0-rc1
+
+; Shorthand syntax for versions if no other options are to be specified:
+projects[wysiwyg] = 2.1
+
+; Place a project within a subdirectory of the `--contrib-destination` specified. 
+projects[cck][subdir] = "contrib"
+
+; URL of an alternate project update XML server to use:
+projects[tao][location] = "http://code.developmentseed.com/fserver"
+
+; The project type:
+projects[tao][type] = theme
+
+; Use an alternative download method instead of retrieval through update XML:
+projects[tao][download][type] = git
+
+; The URL of the repository (required):
+projects[tao][download][url] = git://github.com/developmentseed/tao.git
+
+projects[] = respond
+
+; Provide an alternative directory name for this project:
+;projects[mytheme][directory_name] = "yourtheme"
+
+; Specific URL (can include tokens) to a translation:
+;projects[mytheme][l10n_path] = "http://myl10nserver.com/files/translations/%project-%core-%version-%language.po"
+
+; URL to an l10n server XML info file.
+;projects[mytheme][l10n_url] = "http://myl10nserver.com/l10n_server.xml"
+
+; Allows the project to be installed in a directory that is not empty.
+;projects[myproject][overwrite] = TRUE
+
+; Sometimes, drush (at least, up to 4.5) is not able to resolve
+; dependencies. For example, the Calendar module depends on date_api and date_views,
+; which are submodules of the Date module. Unfortunately, drush is not able
+; to guess that. In such cases, the pre-requisites of a module must be included
+; explicitly in the makefile:
+projects[] = date
+
+; Drupid does not support version constraints yet, but it should not break when it meets one.
+projects[] = file_entity (>1.99)
+projects[] = patterns(>0.1)
+projects[] = "imce"(<10.0)
+projects[] = "insert" (>2.0)
+
+; Patches:
+projects[calendar][patch][rfc-fixes][url] = "http://drupal.org/files/issues/cal-760316-rfc-fixes-2.diff"
+projects[calendar][patch][rfc-fixes][md5] = "e4876228f449cb0c37ffa0f2142"
+
+; shorthand syntax if no md5 checksum is specified
+projects[jquery_ui][patch][] = "http://path/to/some-patch.diff"
+
+; Local project
+projects[foobar][download][url] = "mymodules/foobar.zip"
+
+; An array of non-Drupal-specific libraries to be retrieved:
+libraries[profiler][download][type] = "get"
+libraries[profiler][download][url] = "http://ftp.drupal.org/files/projects/profiler-7.x-2.0-beta1.tar.gz"
+
+libraries[jquery_ui][download][type] = "file"
+libraries[jquery_ui][download][url] = "http://jquery-ui.googlecode.com/files/jquery.ui-1.6.zip"
+libraries[jquery_ui][download][md5] = "c177d38bc7af59d696b2efd7dda5c605"
+libraries[jquery_ui][destination] = "modules/contrib/jquery_ui"
+
+libraries[shadowbox][download][type] = "post"
+libraries[shadowbox][download][post_data] = "format=tar&adapter=jquery&players[]=img&players[]=iframe&players[]=html&players[]=swf&players[]=flv&players[]=qt&players[]=wmp&language=en&css_support=on"
+libraries[shadowbox][download][file_type] = "tar.gz"
+libraries[shadowbox][download][url] = "http://www.shadowbox-js.com/download"
+libraries[shadowbox][directory_name] = "shadowbox"
+libraries[shadowbox][destination] = "libraries"
+
+; Local library
+libraries[foolib][download][url] = "foolib.tar.gz"
+
+; An array of makefiles to include:
+;includes[example] = "example.make"
+;includes[example_relative] = "../example_relative/example_relative.make"
+;includes[remote] = "http://www.example.com/remote.make"
+

data/test/fixtures/drupal-fake-site/modules/aggregator/aggregator.info

@@ -0,0 +1,14 @@
+name = Aggregator
+description = "Aggregates syndicated content (RSS, RDF, and Atom feeds)."
+package = Core
+version = VERSION
+core = 7.x
+files[] = aggregator.test
+configure = admin/config/services/aggregator/settings
+stylesheets[all][] = aggregator.css
+
+; Information added by drupal.org packaging script on 2011-12-05
+version = "7.10"
+project = "drupal"
+datestamp = "1323125439"
+

data/test/fixtures/drupal-fake-site/modules/aggregator/tests/aggregator_test.info

@@ -0,0 +1,12 @@
+name = "Aggregator module tests"
+description = "Support module for aggregator related testing."
+package = Testing
+version = VERSION
+core = 7.x
+hidden = TRUE
+
+; Information added by drupal.org packaging script on 2011-12-05
+version = "7.10"
+project = "drupal"
+datestamp = "1323125439"
+

data/test/fixtures/drupal-fake-site/modules/block/block.info

@@ -0,0 +1,13 @@
+name = Block
+description = Controls the visual building blocks a page is constructed with. Blocks are boxes of content rendered into an area, or region, of a web page.
+package = Core
+version = VERSION
+core = 7.x
+files[] = block.test
+configure = admin/structure/block
+
+; Information added by drupal.org packaging script on 2011-12-05
+version = "7.10"
+project = "drupal"
+datestamp = "1323125439"
+

data/test/fixtures/drupal-fake-site/modules/block/tests/block_test.info

@@ -0,0 +1,12 @@
+name = Block test
+description = Provides test blocks.
+package = Testing
+version = VERSION
+core = 7.x
+hidden = TRUE
+
+; Information added by drupal.org packaging script on 2011-12-05
+version = "7.10"
+project = "drupal"
+datestamp = "1323125439"
+

data/test/fixtures/drupal-fake-site/modules/blog/blog.info

@@ -0,0 +1,12 @@
+name = Blog
+description = Enables multi-user blogs.
+package = Core
+version = VERSION
+core = 7.x
+files[] = blog.test
+
+; Information added by drupal.org packaging script on 2011-12-05
+version = "7.10"
+project = "drupal"
+datestamp = "1323125439"
+

data/test/fixtures/drupal-fake-site/modules/book/book.info

@@ -0,0 +1,14 @@
+name = Book
+description = Allows users to create and organize related content in an outline.
+package = Core
+version = VERSION
+core = 7.x
+files[] = book.test
+configure = admin/content/book/settings
+stylesheets[all][] = book.css
+
+; Information added by drupal.org packaging script on 2011-12-05
+version = "7.10"
+project = "drupal"
+datestamp = "1323125439"
+

data/test/fixtures/drupal-fake-site/modules/color/color.info

@@ -0,0 +1,12 @@
+name = Color
+description = Allows administrators to change the color scheme of compatible themes.
+package = Core
+version = VERSION
+core = 7.x
+files[] = color.test
+
+; Information added by drupal.org packaging script on 2011-12-05
+version = "7.10"
+project = "drupal"
+datestamp = "1323125439"
+

data/test/fixtures/drupal-fake-site/modules/comment/comment.info

@@ -0,0 +1,16 @@
+name = Comment
+description = Allows users to comment on and discuss published content.
+package = Core
+version = VERSION
+core = 7.x
+dependencies[] = text
+files[] = comment.module
+files[] = comment.test
+configure = admin/content/comment
+stylesheets[all][] = comment.css
+
+; Information added by drupal.org packaging script on 2011-12-05
+version = "7.10"
+project = "drupal"
+datestamp = "1323125439"
+

data/test/fixtures/drupal-fake-site/modules/contact/contact.info

@@ -0,0 +1,13 @@
+name = Contact
+description = Enables the use of both personal and site-wide contact forms.
+package = Core
+version = VERSION
+core = 7.x
+files[] = contact.test
+configure = admin/structure/contact
+
+; Information added by drupal.org packaging script on 2011-12-05
+version = "7.10"
+project = "drupal"
+datestamp = "1323125439"
+

data/test/fixtures/drupal-fake-site/modules/contextual/contextual.info

@@ -0,0 +1,11 @@
+name = Contextual links
+description = Provides contextual links to perform actions related to elements on a page.
+package = Core
+version = VERSION
+core = 7.x
+
+; Information added by drupal.org packaging script on 2011-12-05
+version = "7.10"
+project = "drupal"
+datestamp = "1323125439"
+

data/test/fixtures/drupal-fake-site/modules/dashboard/dashboard.info

@@ -0,0 +1,14 @@
+name = Dashboard
+description = Provides a dashboard page in the administrative interface for organizing administrative tasks and tracking information within your site.
+core = 7.x
+package = Core
+version = VERSION
+files[] = dashboard.test
+dependencies[] = block
+configure = admin/dashboard/customize
+
+; Information added by drupal.org packaging script on 2011-12-05
+version = "7.10"
+project = "drupal"
+datestamp = "1323125439"
+

data/test/fixtures/drupal-fake-site/modules/dblog/dblog.info

@@ -0,0 +1,12 @@
+name = Database logging
+description = Logs and records system events to the database.
+package = Core
+version = VERSION
+core = 7.x
+files[] = dblog.test
+
+; Information added by drupal.org packaging script on 2011-12-05
+version = "7.10"
+project = "drupal"
+datestamp = "1323125439"
+

data/test/fixtures/drupal-fake-site/modules/field/field.info

@@ -0,0 +1,17 @@
+name = Field
+description = Field API to add fields to entities like nodes and users.
+package = Core
+version = VERSION
+core = 7.x
+files[] = field.module
+files[] = field.attach.inc
+files[] = tests/field.test
+dependencies[] = field_sql_storage
+required = TRUE
+stylesheets[all][] = theme/field.css
+
+; Information added by drupal.org packaging script on 2011-12-05
+version = "7.10"
+project = "drupal"
+datestamp = "1323125439"
+

data/test/fixtures/drupal-fake-site/modules/field/modules/field_sql_storage/field_sql_storage.info

@@ -0,0 +1,14 @@
+name = Field SQL storage
+description = Stores field data in an SQL database.
+package = Core
+version = VERSION
+core = 7.x
+dependencies[] = field
+files[] = field_sql_storage.test
+required = TRUE
+
+; Information added by drupal.org packaging script on 2011-12-05
+version = "7.10"
+project = "drupal"
+datestamp = "1323125439"
+

data/test/fixtures/drupal-fake-site/modules/field/modules/list/list.info

@@ -0,0 +1,14 @@
+name = List
+description = Defines list field types. Use with Options to create selection lists.
+package = Core
+version = VERSION
+core = 7.x
+dependencies[] = field
+dependencies[] = options
+files[] = tests/list.test
+
+; Information added by drupal.org packaging script on 2011-12-05
+version = "7.10"
+project = "drupal"
+datestamp = "1323125439"
+

data/test/fixtures/drupal-fake-site/modules/field/modules/list/tests/list_test.info

@@ -0,0 +1,12 @@
+name = "List test"
+description = "Support module for the List module tests."
+core = 7.x
+package = Testing
+version = VERSION
+hidden = TRUE
+
+; Information added by drupal.org packaging script on 2011-12-05
+version = "7.10"
+project = "drupal"
+datestamp = "1323125439"
+