onboard 0.1.2 → 0.2.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MGI5YjdkODkxYmYyMTFjY2Q3ZjM0YjJiODE0OTIyN2IwN2M2YzYyMQ==
+    ZDFmNjkwZDVlMGFmMmI1NjYzY2I5OGZmMTgwNzRiYjkwMjBlNGI3YQ==
   data.tar.gz: !binary |-
-    YmU4MzRiNjQ5ZjlhYWM3Y2Y0MzM4NDBmMmE3NzcyMmE2MmJkMmE3OA==
+    NWMyMTdkYTYwNTdmOWM0NDkyZTc3ZGQyMTEwMjJiYzM3MTcyNDE2Ng==
 SHA512:
   metadata.gz: !binary |-
-    ZTRjYjNhYTcwYWYxNDk3NTYwZjMxZjJjYTg0ZTZhNGQ5ZWEwNjUyNWRjNzU2
-    NzgyNjlhMGExNmJlYWY0N2YxM2U5NmZjMjlmMjAzZjhhYzE3ODQ4NDU1MjI4
-    YzczYTRiMmRhMDdiZjExM2ZmODIyMDIxYzQzMDRmNTc3MzNiM2Q=
+    NWRkOTUyMzMxOTJjMGY2MDJmZDQxZDEyMDkxYjJkM2RhNmE0N2ZmM2I3YjE4
+    YTBlMGM1ODg5ZGRlM2UxZThkODkxNWM0ZWI2MjAxZTUxNzY0MTRjYWJiMjFi
+    NjYyZmNhYmI4OTQ2NzM3MWRjNzA1NTg4YTFiYWI1MmRiNzhmNjQ=
   data.tar.gz: !binary |-
-    N2Q5YjNhNjMxMTU2YzQzNWUyOWNjZWZmMzdhOTU1Y2ZkZjIwNDc2MDE2YzFi
-    ZTY4Y2FmNjA2NzAwNGViYTQzNWU0ZDU4YWJmMjJkMWE1NzAxNTFkMGU0MWI3
-    MDBhYjY4MDBmMTAxYzc4ZWNiNThkMzIyYjNjODEzMDBlYzNmOGY=
+    MzQ3NzYwOWNiODMxNzJhNWViZDljODcyOTQyNzk3NWIzOWIzYWIwMzc3ODYw
+    NjNhZTkxNmFkNTgxMTU3MjQ1OGU3YTcyYmIwNTg2OTc4YjBhYTA2NDg4YWQ2
+    ZGJhMjcxODhhM2QyY2MyZTc0YjdjMmE3YjExYTYyZTcwZGEzOGM=

data/README.md

@@ -21,32 +21,35 @@ Or install it yourself as:
 __COMMANDS:__
 ```
 Commands:
-  onboard help [COMMAND]                # Describe available commands or one s...
-  onboard modules DOCROOT -c, --core=N  # add default modules to DOCROOT
+  onboard help [COMMAND]                                  # Describe available commands or one specific command
+  onboard projects CODEBASE -c, --core=N -p, --path=PATH  # add projects to CODEBASE
 ```
 
 __MODULES:__
 ```
 Usage:
-  onboard modules DOCROOT -c, --core=N
+  onboard projects CODEBASE -c, --core=N -p, --path=PATH
 
 Options:
-  -a, [--addendum=one two three]   # Add projects to the default list
-  -c, --core=N                     # Specify Drupal core version
-  -d, [--destination=DESTINATION]  # Specify contrib destination relative to docroot
-  -f, [--force=FORCE]              # Force add modules
-  -n, [--no=NO]                    # Assume 'no' for all prompts
-  -p, [--projects=one two three]   # Pass a custom list of projects
-  -s, [--subdir=SUBDIR]            # Specify contrib subdir relative to 'modules'
-  -y, [--yes=YES]                  # Assume 'yes' for all prompts
+  -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
 
 Description:
-  onboard modules performs multiple steps when installing default contrib
-  modules (acquia_connector, fast_404, memcache):
+  `onboard projects` performs multiple tasks when installing contrib projects:
 
-  1. Checks for each module in the docroot
-  2. Downloads the latest version of each module
-  3. Adds and commits each module
+  * Checks for each project in the CODEBASE
+
+  * Downloads the latest version of each project
+
+  * Adds and commits each project
 ```
 
 ## Contributing

data/lib/onboard/cli.rb

@@ -1,95 +1,82 @@
 # encoding: utf-8
-require 'thor'
+
 require 'open-uri/cached'
-require_relative 'codebase'
+require 'thor'
+
+require_relative 'confirm'
+require_relative 'find'
+require_relative 'project'
+require_relative 'repo'
 
 module Onboard
   class CLI < Thor
     # TODO: switch from DOCROOT to CODEBASE to enable more comprehensive searching
-    desc "modules DOCROOT", "add default modules to DOCROOT"
+    desc "projects CODEBASE", "add projects to CODEBASE"
     long_desc <<-LONGDESC
-      `onboard modules` performs multiple tasks when installing contrib
-      modules:
+      `onboard projects` performs multiple tasks when installing contrib
+      projects:
 
-      * Checks for each module in the docroot
+      * Checks for each project in the CODEBASE
 
-      * Downloads the latest version of each module
+      * Downloads the latest version of each project
 
-      * Adds and commits each module
+      * Adds and commits each project
 
-      Default contrib modules: acquia_connector, fast_404, memcache
     LONGDESC
-    option :addendum, :aliases => "-a", :type => :array, :desc => "Add projects to the default list"
-    # TODO: Analyze codebase for core version?
+    # TODO: Analyze codebase for project version
     # ala - find ./CODEBASE -type f -name '*.info' | xargs -I {} grep -rn '^version = \"' {}
+    option :branch, :aliases => "-b", :desc => "Specify repository branch to update"
     option :core, :required => true, :aliases => "-c", :type => :numeric, :desc => "Specify Drupal core version"
-    option :destination, :aliases => "-d", :desc => "Specify contrib destination relative to docroot"
+    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 :projects, :aliases => "-p", :type => :array, :desc => "Pass a custom list of projects"
-    # option :remove, :aliases => "-r", :desc => "Remove all copies of existing modules"
-    option :subdir, :aliases => "-s", :desc => "Specify contrib subdir relative to 'modules'"
+    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"
-    def modules(docroot)
+    def projects(codebase)
       core = "#{options[:core]}.x"
-      modules = []
-      if options[:projects].nil? == false
-        options[:projects].each { |x| modules.push x }
-      else
-        modules = ["acquia_connector", "fast_404", "memcache"]
-      end
-      if options[:addendum].nil? == false
-        options[:addendum].each { |x| modules.push x }
-      end
-      subdir = options[:subdir].nil? == true ? "" : "/#{options[:subdir]}"
-      destination = options[:destination].nil? ? "sites/all/modules#{subdir}" : "#{options[:destination]}#{subdir}"
-      require 'find'
-      found = []
-      Find.find(docroot) do |e|
-        if File.directory?(e)
-          if modules.include?(File.basename(e))
-            found.push e
-          end
-        end
+      projects = []
+      if options[:modules].nil? == false
+        options[:modules].each { |x| projects.push x }
+      elsif options[:themes].nil? == false
+        options[:themes].each { |x| projects.push x }
       end
+      path = "#{options[:path]}"
+      found = Finder.new(projects, codebase).locate
       if found.any?
         say("Projects exist at the following locations:", :yellow)
-        found.each do |project|
-          puts "  " + project
-        end
+        found.each { |x| puts "  " + x }
         puts ""
       end
       if options[:force] != 'force'
         found.each do |x|
-          modules.delete(File.basename(x))
+          projects.delete(File.basename(x))
         end
       end
-      if modules.empty? == false
+      if projects.empty? == false
         say("Ready to add the following projects:", :green)
-        modules.each do |x|
-          puts "  " + "#{docroot}/#{destination}/#{x}"
+        projects.each do |x|
+          puts "  " + "#{codebase}/#{path}/#{x}"
         end
         puts ""
         if options[:no].nil? && options[:yes].nil?
-          answer = ""
-          while answer !~ /^[Y|N]$/i do
-            answer = ask("Proceed? [Y|N]: ")
-            puts ""
-          end
-          if answer =~ /^[N]$/i
-            say("Script was exited.")
-            exit
-          end
+          Confirm.new("Proceed?").yes?
         elsif options[:no] == 'no'
           say("Script was exited.")
           exit
         end
-        modules.each do |x|
-          Codebase.new("#{docroot}/#{destination}/#{x}").rm
+        projects.each do |x|
+          prm = {}
+          prm['path'] = "#{codebase}/#{path}/#{x}"
+          Project.new(prm).rm
           # TODO: replace 'open().read' with custom caching solution
-          require_relative 'contrib'
-          dl = Contrib.new(x, core).dl
+          pdl = {}
+          pdl['project'] = x
+          pdl['core'] = core
+          dl = Project.new(pdl).dl
           feed_md5, archive = dl
           # TODO: replace 'open().read' with custom caching solution
           open(archive).read
@@ -98,26 +85,36 @@ module Onboard
           md5 = Digest::MD5.file(targz).hexdigest
           # TODO: retry download after failed download verification
           if md5 == feed_md5
-            Codebase.new(targz, "#{docroot}/#{destination}").extract
+            pex = {}
+            pex['dest'] = "#{codebase}/#{path}"
+            pex['path'] = targz 
+            Project.new(pex).extract
           else
             say("Verification failed for #{x} archive!", :red)
             exit
           end
         end
         if options[:vc] == true
-          require_relative 'repo'
-          require_relative 'screen'
-          modules.each do |x|
-            width = Screen.new().width
-            msg = "Pushing #{x} to the remote repo..."
-            spaces = " " * (width - msg.length - 8)
-            say(msg + spaces)
-            Repo.new(docroot, "docroot/#{destination}/#{x}").update
-            # TODO: error handling and conditional messaging for failures
+          require_relative 'msg'
+          branch = options[:branch].nil? ? '' : options[:branch]
+          repo = {}
+          repo['branch'] = branch
+          repo['codebase'] = codebase
+          repo_info = Repo.new(repo).info
+          projects.each do |x|
+            acmsg = "Committing #{x} on #{repo_info['current_branch']} branch..."
+            say(Msg.new(acmsg).format)
+            repo['path'] = "#{path}/#{x}" 
+            Repo.new(repo).update
             say("  [done]", :green)
+            # TODO: error handling and conditional messaging for failures
           end
+          pmsg = "Pushing all changes to #{repo_info['remotes']}..."
+          say(Msg.new(pmsg).format)
+          Repo.new(repo).push
+          say("  [done]", :green)
         else
-          modules.each do |x|
+          projects.each do |x|
             say("#{x} added to codebase but changes are not yet tracked in version control.", :yellow)
           end
         end

data/lib/onboard/confirm.rb

@@ -0,0 +1,27 @@
+#!/usr/bin/env ruby
+
+require 'thor'
+
+module Onboard
+  class Confirm < Thor
+    attr_reader :message
+
+    no_tasks do
+      def initialize(message)
+        @message = message
+      end
+
+      def yes?
+        answer = ""
+        while answer !~ /^[Y|N]$/i do
+          answer = ask(message + " [Y|N]: ")
+          puts ""
+        end
+        if answer =~ /^[N]$/i
+          say("Script was exited.")
+          exit
+        end
+      end
+    end
+  end
+end

data/lib/onboard/find.rb

@@ -0,0 +1,31 @@
+#!/usr/bin/env ruby
+
+require 'find'
+
+module Onboard
+  class Finder
+    attr_reader :needle, :haystack
+
+    def initialize(needle, haystack)
+      @needle = needle
+      @haystack = haystack
+    end
+
+    def locate
+      found = []
+      Find.find(haystack) do |e|
+        if File.directory?(e)
+          if needle.include?(File.basename(e))
+            Find.find(e) do |f|
+              if File.extname(f) == '.info'
+                found.push e
+              end
+            end
+          end
+        end
+      end
+
+      return found.uniq
+    end
+  end
+end

data/lib/onboard/msg.rb

@@ -0,0 +1,24 @@
+#!/usr/bin/env ruby
+
+require 'thor'
+
+require_relative 'screen'
+
+module Onboard
+  class Msg < Thor
+    attr_reader :msg
+
+    no_tasks do
+      def initialize(msg = '')
+        @msg = msg
+      end
+
+      def format
+        width = Screen.new().width
+        spaces = " " * (width - msg.length - 8)
+        return msg + spaces
+      end
+    end
+  end
+end
+

data/lib/onboard/{codebase.rb → project.rb}

@@ -1,6 +1,7 @@
 # encoding: utf-8
 require 'fileutils'
 require 'find'
+require 'nokogiri'
 require 'rubygems/package'
 require 'zlib'
 
@@ -8,12 +9,29 @@ module Onboard
 
   TAR_LONGLINK = '././@LongLink'
 
-  class Codebase
-    attr_reader :path, :dest
+  class Project
+    attr_reader :feed, :path, :dest
 
-    def initialize(path, dest = nil)
-      @path = path
-      @dest = dest
+    def initialize(args = {})
+      @feed = "http://updates.drupal.org/release-history/#{args['project']}/#{args['core']}"
+      @path = args['path']
+      @dest = args['dest']
+    end
+
+    def dl
+      doc = Nokogiri::XML(open(@feed).read)
+      releases = {}
+      doc.xpath('//releases//release').each do |item|
+        if !item.at_xpath('version_extra')
+          releases[item.at_xpath('mdhash').content] = item.at_xpath('download_link').content
+        end
+      end
+      if releases.nil?
+        doc.xpath('//releases//release').each do |item|
+          releases[item.at_xpath('mdhash').content] = item.at_xpath('download_link').content
+        end
+      end
+      return releases.first
     end
 
     def rm
@@ -47,3 +65,4 @@ module Onboard
     end
   end
 end
+

data/lib/onboard/repo.rb

@@ -6,21 +6,32 @@ require 'pathname'
 
 module Onboard
   class Repo
-    attr_reader :docroot, :path
+    attr_reader :g, :path, :branch
 
-    def initialize(docroot, path)
-      @docroot = docroot
-      @path = path
+    def initialize(repo)
+      @codebase = repo['codebase']
+      @g = self.prepare(repo)
+      @path = repo['path']
+      @branch = repo['branch']
+    end
+
+    def info
+      repo = {}
+      repo['current_branch'] = g.current_branch
+      repo['remotes'] = g.remotes
+      return repo
+    end
+
+    def prepare(args)
+      repo = Git.open((Pathname.new(args['codebase'])).to_s)
+      selection = args['branch'].empty? ? repo.current_branch : args['branch']
+      repo.branch(selection).checkout
+      return repo
     end
 
     def update
-      prj_root = Pathname.new(docroot)
-      workdir = prj_root.parent.to_s
       project = File.basename(path)
 
-      g = Git.open(workdir)
-      g.branch('master').checkout
-
       changes = []
       g.status.changed.keys.each { |x| changes.push x }
       g.status.deleted.keys.each { |x| changes.push x }
@@ -28,11 +39,14 @@ module Onboard
 
       if changes.nil? == false
         g.add(path, :all=>true)
-        g.commit("Adds #{project}")
-        g.push
+        g.commit("Add #{project}")
       else
         puts "No changes to commit for #{project}"
       end
     end
+
+    def push
+      g.push
+    end
   end
-end
+end

data/lib/onboard/version.rb

@@ -1,3 +1,3 @@
 module Onboard
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: onboard
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Nathaniel Hoag
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-19 00:00:00.000000000 Z
+date: 2014-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -122,8 +122,10 @@ files:
 - bin/onboard
 - lib/onboard.rb
 - lib/onboard/cli.rb
-- lib/onboard/codebase.rb
-- lib/onboard/contrib.rb
+- lib/onboard/confirm.rb
+- lib/onboard/find.rb
+- lib/onboard/msg.rb
+- lib/onboard/project.rb
 - lib/onboard/repo.rb
 - lib/onboard/screen.rb
 - lib/onboard/version.rb

data/lib/onboard/contrib.rb

@@ -1,28 +0,0 @@
-# encoding: utf-8
-require 'nokogiri'
-
-module Onboard
-  class Contrib
-    attr_reader :project, :core
-
-    def initialize(project, core)
-      @feed = "http://updates.drupal.org/release-history/#{project}/#{core}"
-    end
-
-    def dl
-      doc = Nokogiri::XML(open(@feed).read)
-      releases = {}
-      doc.xpath('//releases//release').each do |item|
-        if !item.at_xpath('version_extra')
-          releases[item.at_xpath('mdhash').content] = item.at_xpath('download_link').content
-        end
-      end
-      if releases.nil?
-        doc.xpath('//releases//release').each do |item|
-          releases[item.at_xpath('mdhash').content] = item.at_xpath('download_link').content
-        end
-      end
-      return releases.first
-    end
-  end
-end