onboard 0.2.3 → 0.3.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjlmMTg5NmViZWI0N2VmNGNhYTRkNDg5ZDM2YWFjYWU5Y2EwZWI5NA==
+    NTE0NDRmNTk5YzIyYjZhNTRlMWRkM2VlZjMwYmFjZTVlYTNiNTJlNw==
   data.tar.gz: !binary |-
-    MmU4ZjRiMjllNWFhYjlhODY1ODFjNjM2YTFkNDIxNjEzM2I1NWE1ZQ==
+    YzliYzIwZTQ5ZmQyYWQ0ODcxNTQ3YTJhNWNlYmNkMjgxZWI2NzE1ZQ==
 SHA512:
   metadata.gz: !binary |-
-    MmVlZjM4MmExZGJlMjE1YmQ4OWNmOGE3NDI5ZjM1NGE1ODA1YzQ1ZTE4MTk3
-    ZjIzNTFhMzMzOGFhZTMwMzgwYzU2ZWJmMGYxYzc5ZjUwYTFlMTM2MDYyOTU2
-    YWY5NjFiMDFhNWQ2MmM1YTZhYzY0NmViZDk2OTJkM2VkMGVmYjY=
+    ZjZhZDYwOTgyMmFlN2I1OWI3MGFjOTJmZjI2N2IwMDdhNzcxNzJlZmMzZWZi
+    Zjg1NWJjNzVmNmI3NDI3YTM1NjQ3MmU1ZGJiYjU1NDZkNjc0YzQ3YzZmZTZl
+    NTcwN2QyNTcwMzdkMTY1ZWEwN2M0MDdkZGZiNmEzMzJmMWRlMDk=
   data.tar.gz: !binary |-
-    NjI0MGMwNjlkYjNjODg0MmZjNjg0ZTk5MzdjZTQ4MDk5MThkZjkwZjhmNTE3
-    ODIzMTQ1YmNhYzhmN2E1YzI3OWQyODM2ZmI5NGNlYWNmZGIxOTNlNjIzNWQ1
-    ZGFlNDgwMzg0ZDk3M2E5YTllYjgzODUwOTFjM2FmMzIzM2QzODY=
+    MmYyZTlkZjBkMTlhZWI4MDRjNWMxMjk1OTgwM2Q4MWY2OGRiYjFmZDlmMzUw
+    YjJmZjcwMDliOGY3ZjcwMWRhNDU3YTZmYjJlNmM2YmQ0ZTFkYmM0OWU2ZDcx
+    ZGIwZGFkOGY4ODQ0N2UxNDllMGJlYThjZGI4M2JhNDc4NTkxNjM=

data/.rubocop.yml

@@ -0,0 +1,8 @@
+Documentation:
+  Enabled: false
+
+HashSyntax:
+  EnforcedStyle: hash_rockets
+
+LineLength:
+  Enabled: false

data/.travis.yml

@@ -0,0 +1,6 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - 2.1.0
+  - 2.1.1
+  - 2.1.2

data/Gemfile

@@ -1,4 +1,14 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in onboard.gemspec
+gem 'rake'
+
+group :test do
+  gem 'coveralls'
+  gem 'rspec', '>= 3'
+  gem 'rubocop', '>= 0.25'
+  gem 'simplecov', '>= 0.9'
+  gem 'timecop'
+  gem 'webmock', '>= 1.10.1'
+end
+
 gemspec

data/README.md

@@ -21,33 +21,36 @@ Or install it yourself as:
 __COMMANDS:__
 ```
 Commands:
-  onboard help [COMMAND]                                  # Describe available commands or one specific command
-  onboard projects CODEBASE -c, --core=N -p, --path=PATH  # add projects to CODEBASE
+  onboard help [COMMAND]                                   # Describe available commands or one specific command
+  onboard lift CODEBASE (coming soon)                      # add lift to CODEBASE
+  onboard projects CODEBASE -d, --destination=DESTINATION  # add projects to CODEBASE
+  onboard update CODEBASE (coming soon)                    # update projects in CODEBASE
 ```
 
-__MODULES:__
+__PROJECTS:__
 ```
 Usage:
-  onboard projects CODEBASE -c, --core=N -p, --path=PATH
+  onboard projects CODEBASE -d, --destination=DESTINATION
 
 Options:
-  -b, [--branch=BRANCH]          # Specify repository branch to update
-  -c, --core=N                   # Specify Drupal core version
-  -p, --path=PATH                # Specify project path relative to CODEBASE
-  -f, [--force=FORCE]            # Force add modules (even if already present)
-  -n, [--no=NO]                  # Assume 'no' for all prompts
-  -m, [--modules=one two three]  # Pass a list of modules
-  -t, [--themes=one two three]   # Pass a list of themes
-      [--vc], [--no-vc]          # Enable/Disable version control handling
-                                 # Default: true
-  -y, [--yes=YES]                # Assume 'yes' for all prompts
+  -c, [--commit=COMMIT]           # Specify commit object for Git source
+  -D, [--delete=DELETE]           # Delete existing projects
+  -d, --destination=DESTINATION   # Specify project destination relative to CODEBASE
+  -f, [--force=FORCE]             # Force add projects (even if already present)
+  -n, [--no=NO]                   # Assume "no" for all prompts
+  -p, [--projects=one two three]  # Pass a list of projects
+      [--vc], [--no-vc]           # Enable/Disable version control handling
+                                  # Default: true
+  -y, [--yes=YES]                 # Assume "yes" for all prompts
 
 Description:
   `onboard projects` performs multiple tasks when installing contrib projects:
 
   * Checks for each project in the CODEBASE
 
-  * Downloads the latest version of each project
+  * Reports patched projects
+
+  * Downloads the latest/stablest version of each project
 
   * Adds and commits each project
 ```

data/Rakefile

@@ -1,2 +1,20 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
 
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec)
+
+begin
+  require 'rubocop/rake_task'
+  RuboCop::RakeTask.new
+rescue LoadError
+  desc 'Run RuboCop'
+  task :rubocop do
+    $stderr.puts 'Rubocop is disabled'
+  end
+end
+
+Dir.glob('tasks/*.rake').each { |r| import r }
+
+task :release => ['completion:zsh', 'completion:bash']
+task :test => :spec
+task :default => [:spec, :rubocop]

data/lib/onboard/cli.rb

@@ -1,95 +1,84 @@
 # encoding: utf-8
 
-require 'open-uri/cached'
 require 'thor'
 
 require_relative 'confirm'
+require_relative 'core'
 require_relative 'find'
+require_relative 'prepare'
 require_relative 'project'
-require_relative 'repo'
 
 module Onboard
   class CLI < Thor
-    desc "projects CODEBASE", "add projects to CODEBASE"
+    desc 'update CODEBASE', 'update projects in CODEBASE'
+    long_desc <<-LONGDESC
+      `onboard update` performs multiple tasks when updating contrib projects:
+
+      * Checks for each project in the CODEBASE
+
+      * Downloads the latest release for each project
+
+      * Adds and commits updates
+
+    LONGDESC
+    option :all, :default => false, :aliases => '-a', :desc => 'Perform all updates (default is security updates only)'
+    option :core, :aliases => '-C', :desc => 'Update Drupal core only'
+    option :contrib, :aliases => '-c', :desc => 'Update Drupal contrib only'
+    option :distro, :aliases => '-d', :desc => 'Specify a distribution other than Drupal or Pressflow'
+    option :no, :aliases => '-n', :desc => 'Assume "no" for all prompts'
+    option :projects, :aliases => '-p', :desc => 'Specify projects to update'
+    option :vc, :type => :boolean, :default => true, :desc => 'Enable/Disable version control handling'
+    option :yes, :aliases => '-y', :desc => 'Assume "yes" for all prompts'
+    def update(codebase)
+      puts codebase
+    end
+
+    desc 'projects CODEBASE', 'add projects to CODEBASE'
     long_desc <<-LONGDESC
       `onboard projects` performs multiple tasks when installing contrib
       projects:
 
       * Checks for each project in the CODEBASE
 
-      * Downloads the latest version of each project
+      * Reports patched projects
+
+      * Downloads the latest/stablest version of each project
 
       * Adds and commits each project
 
     LONGDESC
-    option :branch, :aliases => "-b", :desc => "Specify repository branch to update"
-    option :core, :required => true, :aliases => "-c", :type => :numeric, :desc => "Specify Drupal core version"
-    option :path, :required => true, :aliases => "-p", :desc => "Specify project path relative to CODEBASE"
-    option :force, :aliases => "-f", :desc => "Force add modules (even if already present)"
-    option :no, :aliases => "-n", :desc => "Assume 'no' for all prompts"
-    option :modules, :aliases => "-m", :type => :array, :desc => "Pass a list of modules"
-    option :delete, :aliases => "-d", :desc => "Delete existing projects"
-    # option :source, :aliases => "-s", :desc => "Specify a project source other than drupal.org"
-    option :themes, :aliases => "-t", :type => :array, :desc => "Pass a list of themes"
-    option :vc, :type => :boolean, :default => true, :desc => "Enable/Disable version control handling"
-    option :yes, :aliases => "-y", :desc => "Assume 'yes' for all prompts"
+    option :commit, :aliases => '-c', :desc => 'Specify commit object for Git source'
+    option :delete, :aliases => '-D', :desc => 'Delete existing projects'
+    option :destination, :required => true, :aliases => '-d', :desc => 'Specify project destination relative to CODEBASE'
+    option :force, :aliases => '-f', :desc => 'Force add projects (even if already present)'
+    option :no, :aliases => '-n', :desc => 'Assume "no" for all prompts'
+    option :projects, :aliases => '-p', :type => :array, :desc => 'Pass a list of projects'
+    # option :source, :aliases => '-s', :desc => 'Specify a project source other than drupal.org'
+    option :vc, :type => :boolean, :default => true, :desc => 'Enable/Disable version control handling'
+    option :yes, :aliases => '-y', :desc => 'Assume "yes" for all prompts'
     def projects(codebase)
-      core = "#{options[:core]}.x"
-      projects = {}
-      if options[:modules].nil? == false
-        options[:modules].each { |x| projects[x] = '' }
-      elsif options[:themes].nil? == false
-        options[:themes].each { |x| projects[x] = '' }
-      end
-      path = "#{options[:path]}"
-      found = Finder.new(projects, codebase).locate
-      if found.empty? == false
-        say("Projects exist at the following locations:", :yellow)
-        found.each do |x, y|
-          puts "  " + x
-          projects[File.basename(x)] = y[0]
-        end
-        puts ""
-        if options[:delete] == 'delete'
-          say("Ready to delete existing projects:", :yellow)
-          Confirm.new("Proceed?", true).yes?
-          found.each do |x, y|
-            Project.new.clean(x)
-            projects[File.basename(x)] = ''
-          end
-        end
-      end
-      if options[:force] != 'force'
-        if found.empty? == false
-          found.each do |x, y|
-            projects.delete(File.basename(x))
-          end
-        end
-      end
-      if projects.empty? == false
-        say("Ready to add the following projects:", :green)
-        projects.each do |x, y|
-          puts "  " + "#{codebase}/#{path}/#{x}"
-        end
-        puts ""
-        if options[:no].nil? && options[:yes].nil?
-          Confirm.new("Proceed?").yes?
-        elsif options[:no] == 'no'
-          say("Script was exited.")
-          exit
-        end
-        prj = {}
-        branch = options[:branch].nil? ? '' : options[:branch]
-        prj['branch'] = branch
-        prj['codebase'] = codebase
-        prj['core'] = core
-        prj['path'] = path
-        prj['projects'] = projects
-        prj['vc'] = options[:vc]
-        Project.new(prj).dl
-      else
-        say("All projects already in codebase.", :yellow)
-      end
+      found = Finder.new(options[:projects], codebase).locate
+      projects, answer = Prepare.new(codebase, found, options).do
+      info = [codebase, Core.new(codebase).info['major'], answer]
+      Project.new(info, projects, options).dl
+    end
+
+    desc 'lift CODEBASE', 'add lift to CODEBASE'
+    long_desc <<-LONGDESC
+      `onboard lift` performs multiple tasks when adding lift:
+
+      * Checks for each lift component in the CODEBASE
+
+      * Downloads the recommended release for each lift component
+
+      * Adds and commits updates
+
+    LONGDESC
+    option :no, :aliases => '-n', :desc => 'Assume "no" for all prompts'
+    option :vc, :type => :boolean, :default => true, :desc => 'Enable/Disable version control handling'
+    option :yes, :aliases => '-y', :desc => 'Assume "yes" for all prompts'
+    def lift(codebase)
+      puts codebase
     end
   end
 end

data/lib/onboard/confirm.rb

@@ -12,20 +12,29 @@ module Onboard
         @full_stop = full_stop
       end
 
-      def yes?
-        answer = ""
-        while answer !~ /^[Y|N]$/i do
-          answer = ask(message + " [Y|N]: ")
-          puts ""
+      def q(prefill = '')
+        return response(prefill) if prefill =~ /^[N]$/i || prefill =~ /^[Y]$/i
+        answer = ''
+        while answer !~ /^[Y|N]$/i
+          answer = ask(message + ' [Y|N]: ')
+          puts ''
         end
+        response(answer)
+      end
+
+      def no
+        if full_stop
+          say('Script was exited.')
+          exit
+        else
+          say('Action was aborted.')
+          return false
+        end
+      end
+
+      def response(answer)
         if answer =~ /^[N]$/i
-          if full_stop
-            say("Script was exited.")
-            exit
-          else
-            say("Action was aborted.")
-            return false
-          end
+          no
         elsif answer =~ /^[Y]$/i
           return true
         end

data/lib/onboard/core.rb

@@ -0,0 +1,67 @@
+# encoding: utf-8
+
+require 'find'
+
+module Onboard
+  class Core
+    attr_reader :codebase
+
+    def initialize(codebase)
+      @codebase = codebase
+    end
+
+    def parser(file, v, pattern)
+      open(file) do |f|
+        f.each_line.find do |line|
+          next unless v.match(line)
+          return line.scan(pattern)[0][0] unless line.scan(pattern)[0].nil?
+        end
+      end
+    end
+
+    def drupal(file)
+      pattern = /.*?"(.*?)".*$/
+      v = /version/
+      parser(file, v, pattern)
+    end
+
+    def pressflow(file)
+      pattern = /^.*?,\s\'(.*?)\'.*$/
+      v = /define\(\'VERSION/
+      parser(file, v, pattern)
+    end
+
+    def collector
+      i = {}
+      Find.find(codebase) do |e|
+        next unless File.file?(e)
+        i['drupal'] = drupal(e) if %r{modules/system/system\.info$} =~ e
+        i['pressflow'] = pressflow(e) if %r{modules/system/system\.module$} =~ e
+        if /includes\/bootstrap\.inc$/ =~ e
+          i['distro'] = pressflow?(e) ? 'pressflow' : 'drupal'
+        end
+      end
+      i
+    end
+
+    def info
+      core = {}
+      i = collector
+      version = i['pressflow'].nil? ? i['drupal'] : i['pressflow']
+      core['distro'] = i['distro']
+      core['version'] = version
+      core['major'] = "#{version.scan(/^(.*?)\..*$/)[0][0]}.x"
+      core
+    end
+
+    def pressflow?(file)
+      pattern = /drupal_page_cache_header_external/
+      open(file) do |f|
+        f.each_line.find do |line|
+          next unless pattern.match(line)
+          return true
+        end
+      end
+    end
+  end
+end

data/lib/onboard/download.rb

@@ -2,28 +2,33 @@
 
 require 'fileutils'
 require 'net/http'
+require 'rubygems/package'
 
 module Onboard
+  DRUPAL_DL_LINK = 'http://ftp.drupal.org/files/projects/'
+
   class Download
     attr_reader :cache_dir
 
-    def initialize(cache_dir='/tmp/onboard/cache')
+    def initialize(cache_dir = '/tmp/onboard/cache')
       @cache_dir = cache_dir
     end
 
+    def build_link(project, version)
+      DRUPAL_DL_LINK + "#{project}-#{version}.tar.gz"
+    end
+
     def path(url)
-      File.join("", @cache_dir, Digest::MD5.hexdigest(url))
+      File.join('', @cache_dir, Digest::MD5.hexdigest(url))
     end
 
-    def fetch(url, max_age=1800)
-      unless File.directory?(cache_dir)
-         FileUtils.mkdir_p(cache_dir)
-      end
-      file_path = self.path(url)
-      if File.exists? file_path
-        return File.new(file_path).read if Time.now-File.mtime(file_path)<max_age
+    def fetch(url, max_age = 1800)
+      FileUtils.mkdir_p(cache_dir) unless File.directory?(cache_dir)
+      file_path = path(url)
+      if File.exist? file_path
+        return File.new(file_path).read if Time.now - File.mtime(file_path) < max_age
       end
-      File.open(file_path, "w") do |data|
+      File.open(file_path, 'w') do |data|
         data << Net::HTTP.get_response(URI.parse(url)).body
       end
     end

data/lib/onboard/extract.rb

@@ -0,0 +1,57 @@
+# encoding: utf-8
+
+require 'fileutils'
+require 'rubygems/package'
+require 'thor'
+require 'zlib'
+
+module Onboard
+  TAR_LONGLINK = '././@LongLink'
+
+  class Extract
+    attr_reader :archive, :link, :path
+
+    def initialize(archive, link, path)
+      @archive = archive
+      @link = link
+      @path = path
+    end
+
+    def longlink(entry)
+      return File.join path, entry.read.strip if entry.full_name == TAR_LONGLINK
+    end
+
+    def xdir(dst, entry)
+      return false unless entry.directory?
+      FileUtils.rm_rf dst unless File.directory? dst
+      FileUtils.mkdir_p dst, :mode => entry.header.mode, :verbose => false
+    end
+
+    def xfile(dst, entry)
+      return false unless entry.file?
+      FileUtils.rm_rf dst unless File.file? dst
+      File.open dst, 'wb' do |f|
+        f.print entry.read
+      end
+      FileUtils.chmod entry.header.mode, dst, :verbose => false
+    end
+
+    def xlink(dst, entry)
+      return false unless entry.header.typeflag == '2' # Symlink!
+      File.symlink entry.header.linkname, dst
+    end
+
+    def x(dst = nil)
+      Gem::Package::TarReader.new(Zlib::GzipReader.open archive) do |tar|
+        tar.each do |entry|
+          dst = longlink(entry)
+          dst ||= File.join path, entry.full_name
+          xdir(dst, entry)
+          xfile(dst, entry)
+          xlink(dst, entry)
+          dst = nil
+        end
+      end
+    end
+  end
+end

data/lib/onboard/find.rb

@@ -14,22 +14,19 @@ module Onboard
     def locate
       found = {}
       Find.find(haystack) do |e|
-        if File.directory?(e)
-          if needle.has_key?(File.basename(e))
-            Dir.entries(e).select do |f|
-              file = "#{e}/#{f}"
-              if File.file?(file)
-                if self.info_ext?(file)
-                  if self.version(file).empty? == false
-                    found[e] = self.version(file)
-                  end
-                end
-              end
-            end
-          end
-        end
+        next unless File.directory?(e)
+        next unless needle.include?(File.basename(e))
+        file = info_file(e)
+        found[e] = version(file)
+      end
+      found
+    end
+
+    def info_file(dir)
+      Find.find(dir).select do |f|
+        next unless File.file?(f)
+        return f if info_ext?(f)
       end
-      return found
     end
 
     def info_ext?(file)
@@ -40,7 +37,7 @@ module Onboard
       File.open(file) do |g|
         g.each_line do |line|
           if line =~ /version/
-            return line.scan(/.*?"(.*?)".*$/)[0].nil? ? '' : line.scan(/.*?"(.*?)".*$/)[0]
+            return line.scan(/.*?"(.*?)".*$/)[0].nil? ? false : line.scan(/.*?"(.*?)".*$/)[0][0]
           end
         end
       end

data/lib/onboard/msg.rb

@@ -14,11 +14,10 @@ module Onboard
       end
 
       def format
-        height, width = Screen.new().size
-        spaces = " " * (width - msg.length - 8)
+        _height, width = Screen.new.size
+        spaces = ' ' * (width - msg.length - 8)
         say(msg + spaces)
       end
     end
   end
 end
-

data/lib/onboard/patch.rb

@@ -0,0 +1,38 @@
+#!/usr/bin/env ruby
+
+require 'fileutils'
+require 'git'
+require 'pathname'
+require 'thor'
+
+module Onboard
+  class Patch
+    attr_reader :dir
+
+    def initialize(dir = '/tmp/onboard/patches')
+      @dir = dir
+    end
+
+    def patch_dir
+      FileUtils.mkdir_p(dir) unless File.directory?(dir)
+    end
+
+    def cleanup
+      Dir.foreach(dir) do |item|
+        file = "#{dir}/#{item}"
+        FileUtils.rm_r file if File.zero?(file)
+      end
+    end
+
+    def open(project)
+      patch_dir
+      patch_file = File.open("#{dir}/#{Time.now.to_i}_#{project}.patch", 'w')
+      patch_file
+    end
+
+    def close(patch_file = '')
+      patch_file.close
+      cleanup
+    end
+  end
+end