drupid 1.0.1 → 1.1.0

data/lib/drupid/utils.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
@@ -59,7 +59,7 @@ module Drupid
       class <<self
         def blue;   bold      34; end
         def white;  bold      39; end
-        def red;    underline 31; end
+        def red;    color     31; end
         def yellow; bold      33; end
         def purple; bold      35; end
         def reset;  escape     0; end
@@ -90,12 +90,12 @@ module Drupid
 
     # Print a warning message.
     def owarn warning
-      puts "#{Tty.red}Warning#{Tty.reset}: #{warning}"
+      puts "#{Tty.red}Warn#{Tty.reset}: #{warning}"
     end
 
     # Prints an error message.
     def ofail error, *info
-      puts "#{Tty.red}Error#{Tty.reset}: #{error}"
+      puts "#{Tty.red}Fail#{Tty.reset}: #{error}"
       puts info unless info.empty?
     end
 
@@ -119,7 +119,7 @@ module Drupid
     # Prints a notice if in verbose mode.
     def blah notice
       return unless $VERBOSE
-      puts notice.to_s
+      puts "#{Tty.green}==>#{Tty.reset} #{notice}"
     end
 
     # Executes a command. Returns the output of the command.
@@ -140,6 +140,7 @@ module Drupid
       cmd << ' >'    + Shellwords.shellescape(opts[:out]) if opts[:out]
       cmd << ' 2>'   + Shellwords.shellescape(opts[:err]) if opts[:err]
       cmd << ' 2>&1' if opts[:redirect_stderr_to_stdout]
+      debug "Pwd: #{Dir.pwd}"
       debug cmd
       return cmd if opts[:dry]
       output = %x|#{cmd}| # Run baby run!
@@ -152,9 +153,6 @@ module Drupid
 
     def curl *args
       curl = Pathname.new(which 'curl')
-      raise "curl not found" unless curl.exist?
-      raise "curl is not executable" unless curl.executable?
-
       args = ['-qf#LA', DRUPID_USER_AGENT, *args]
       args << "--insecure" #if MacOS.version < 10.6
       args << "--silent" unless $VERBOSE
@@ -241,7 +239,7 @@ module Drupid
         yield
       ensure
         FileUtils.chdir wd
-        tmp.rmtree
+        dont_debug { tmp.rmtree }
       end
     end
 
@@ -296,6 +294,17 @@ module Drupid
       p.open("w") { |f| f.write(content) }
     end
 
+    # Temporarily forces $DEBUG = false in the given block.
+    #
+    # This is used to suppress some harmless but annoying exception messages
+    # from some methods, e.g., FileUtils.mkpath.
+    def dont_debug
+      saved_debug = $DEBUG
+      $DEBUG = false
+      yield
+      $DEBUG = saved_debug
+    end
+
   end # Utils
 end # Drupid
 

data/lib/drupid/version.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
@@ -121,7 +121,27 @@ module Drupid
     # Returns true if this version represents a development snapshot;
     # returns false otherwise.
     def development_snapshot?
-      'x' == @patchlevel
+      '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.
@@ -155,6 +175,10 @@ module Drupid
       @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
@@ -175,6 +199,29 @@ module Drupid
       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 = ''
@@ -198,7 +245,6 @@ module Drupid
     def encode_extra(e)
       @extra_string = e.start_with?('-') ? e.sub(/-/, '') : e
       if e.match(/dev(\d*)$/)
-        @patchlevel = 'x'
         @extra_type = DEVELOPMENT
         @extra_num = ($~[1] == '') ? UNKNOWN : $~[1].to_i
         return

metadata

@@ -1,30 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: drupid
 version: !ruby/object:Gem::Version
-  version: 1.0.1
-  prerelease: 
+  version: 1.1.0
 platform: ruby
 authors:
 - Lifepillar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-05 00:00:00.000000000 Z
+date: 2013-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rgl
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.4.0
 description: Drupid keeps a Drush makefile in sync with a Drupal distribution.
@@ -34,6 +31,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/drupid.rb
 - lib/drupid/component.rb
 - lib/drupid/download_strategy.rb
 - lib/drupid/drush.rb
@@ -47,30 +45,29 @@ files:
 - lib/drupid/updater.rb
 - lib/drupid/utils.rb
 - lib/drupid/version.rb
-- lib/drupid.rb
 - bin/drupid
 homepage: http://lifepillar.com
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.21
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: The not-so-smart Drupal bundler!
 test_files: []