onboard 0.2.2 → 0.2.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTYzNmVlZDFjMDRmZWViZGVmYzllMTM3MjAzMGZkNjU4NjYwNjc5OA==
+    MjlmMTg5NmViZWI0N2VmNGNhYTRkNDg5ZDM2YWFjYWU5Y2EwZWI5NA==
   data.tar.gz: !binary |-
-    YTQwZTBhYmRlZDc2MzRlYmVlZjliY2JiMzI0ZDY3NDY5MTM1M2RmOA==
+    MmU4ZjRiMjllNWFhYjlhODY1ODFjNjM2YTFkNDIxNjEzM2I1NWE1ZQ==
 SHA512:
   metadata.gz: !binary |-
-    MTlhMDY5YTc4YTc2MjJmMTJlYzAzMTkwOGVmZTFlOWM0NTEwM2JiN2ViM2E5
-    NzhkMzMwYjcyZWYwOGU4ZjRjM2IyZGFjZjFmMDkwYmZmMGVhNTc5MzJkNjg4
-    ODllNTVlNjI5ODkyMzk2MDcxNjFiZGU3ZDdkODY1MzQ3ZGQzYzQ=
+    MmVlZjM4MmExZGJlMjE1YmQ4OWNmOGE3NDI5ZjM1NGE1ODA1YzQ1ZTE4MTk3
+    ZjIzNTFhMzMzOGFhZTMwMzgwYzU2ZWJmMGYxYzc5ZjUwYTFlMTM2MDYyOTU2
+    YWY5NjFiMDFhNWQ2MmM1YTZhYzY0NmViZDk2OTJkM2VkMGVmYjY=
   data.tar.gz: !binary |-
-    YTllNDkwOTE1ZjJkZmExYzc0NGQyYWIxYWQ0MjM4MThlYTFjMGQ2MTFhZjBj
-    Y2MwMzYwY2EwM2I5MzAyNzNlZmU0ZGZlOTRjMjc2ZWMwM2Q2NjIzM2VmNzM2
-    NjUyNjI4MjVmZmJjMDUzZTE2NDViMmQ4YWNiM2Y5NTUwODYwOWI=
+    NjI0MGMwNjlkYjNjODg0MmZjNjg0ZTk5MzdjZTQ4MDk5MThkZjkwZjhmNTE3
+    ODIzMTQ1YmNhYzhmN2E1YzI3OWQyODM2ZmI5NGNlYWNmZGIxOTNlNjIzNWQ1
+    ZGFlNDgwMzg0ZDk3M2E5YTllYjgzODUwOTFjM2FmMzIzM2QzODY=

data/lib/onboard/cli.rb

@@ -28,7 +28,7 @@ module Onboard
     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 :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"
@@ -50,6 +50,14 @@ module Onboard
           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

data/lib/onboard/confirm.rb

@@ -4,11 +4,12 @@ require 'thor'
 
 module Onboard
   class Confirm < Thor
-    attr_reader :message
+    attr_reader :message, :full_stop
 
     no_tasks do
-      def initialize(message)
+      def initialize(message, full_stop = false)
         @message = message
+        @full_stop = full_stop
       end
 
       def yes?
@@ -18,8 +19,15 @@ module Onboard
           puts ""
         end
         if answer =~ /^[N]$/i
-          say("Script was exited.")
-          exit
+          if full_stop
+            say("Script was exited.")
+            exit
+          else
+            say("Action was aborted.")
+            return false
+          end
+        elsif answer =~ /^[Y]$/i
+          return true
         end
       end
     end

data/lib/onboard/download.rb

@@ -1,10 +1,13 @@
 # encoding: utf-8
 
+require 'fileutils'
 require 'net/http'
 
 module Onboard
   class Download
-    def initialize(cache_dir='/tmp')
+    attr_reader :cache_dir
+
+    def initialize(cache_dir='/tmp/onboard/cache')
       @cache_dir = cache_dir
     end
 
@@ -13,6 +16,9 @@ module Onboard
     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

data/lib/onboard/project.rb

@@ -38,32 +38,60 @@ module Onboard
 
       def hacked?(project, existing)
         self.clean("#{path}/#{project}")
-        link = DRUPAL_DL_LINK + project + "-" + existing + ".tar.gz"
+        link = self.build_link(project, existing)
         Download.new.fetch(link)
         self.extract(Download.new.path(link)) if self.verify(project, link, existing)
-        st = {}
-        st['codebase'] = codebase
-        changes = Repo.new(st).st
+        repo = self.build_vc(project)
+        changes = Repo.new(repo).st(true)
         if changes.empty? == false
-          Confirm.new("Proceed?").yes?
+          return !Confirm.new("Proceed?").yes?
+        else
+          return false
+        end
+      end
+
+      def latest?(latest, existing, project)
+        if Gem::Dependency.new('', "~> #{latest}").match?('', "#{existing}")
+          say("#{project} is already at the latest version (#{latest}).", :yellow)
+          return true
+        else
+          return false
         end
       end
 
+      def build_link(project, version)
+        DRUPAL_DL_LINK + "#{project}-#{version}.tar.gz"
+      end
+
       def dl
         changes = []
         projects.each do |x, y|
-          self.hacked?(x, y) if y.empty? == false
-          self.clean("#{path}/#{x}")
-          # TODO: check existing version against release version - abort if same.
-          md5, link = self.release(x)
-          Download.new.fetch(link)
-          # TODO: retry download after failed download verification
-          self.extract(Download.new.path(link)) if self.verify(x, link)
-          if vc == true
-            repo = self.build_vc(x)
-            changes += self.vc_up(repo)
+          md5, version = self.release(x)
+          if y.empty? == false
+            if !self.hacked?(x, y) && !self.latest?(version, y, x)
+              proceed = true
+            else
+              proceed = false
+            end
+          else
+            proceed = true
+          end
+          if proceed
+            self.clean("#{path}/#{x}")
+            link = self.build_link(x, version)
+            Download.new.fetch(link)
+            # TODO: retry download after failed download verification
+            self.extract(Download.new.path(link)) if self.verify(x, link)
+            if vc == true
+              repo = self.build_vc(x)
+              changes += self.vc_up(repo)
+            else
+              say("#{x} added to codebase but changes are not yet under version control.", :yellow)
+            end
           else
-            say("#{x} added to codebase but changes are not yet under version control.", :yellow)
+            self.clean("#{path}/#{x}")
+            repo = self.build_vc(x)
+            Repo.new(repo).co
           end
         end
         if changes.empty? == false
@@ -81,6 +109,10 @@ module Onboard
         return repo
       end
 
+      def vc_co(args)
+        Repo.new(args).co
+      end
+
       def vc_up(args)
         g = Repo.new(args)
         info = g.info
@@ -106,11 +138,11 @@ module Onboard
       end
 
       def verify(x, file, version='')
-        md5, link = self.release(x, version)
+        md5, version = self.release(x, version)
         if md5 == Digest::MD5.file(Download.new.path(file)).hexdigest
           return true
         else
-          say("Verification failed for #{project} download!", :red)
+          say("Verification failed for #{x} download!", :red)
           exit
         end
       end
@@ -124,19 +156,19 @@ module Onboard
         if version.empty? == false
           doc.xpath('//releases//release').each do |item|
             if item.at_xpath('version').content == version
-              releases[item.at_xpath('mdhash').content] = item.at_xpath('download_link').content
+              releases[item.at_xpath('mdhash').content] = item.at_xpath('version').content
             end
           end
         else
           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
+              releases[item.at_xpath('mdhash').content] = item.at_xpath('version').content
             end
           end
         end
         if releases.nil?
           doc.xpath('//releases//release').each do |item|
-            releases[item.at_xpath('mdhash').content] = item.at_xpath('download_link').content
+            releases[item.at_xpath('mdhash').content] = item.at_xpath('version').content
           end
         end
         return releases.first

data/lib/onboard/repo.rb

@@ -1,12 +1,13 @@
 #!/usr/bin/env ruby
 
+require 'fileutils'
 require 'git'
 require 'pathname'
 require 'thor'
 
 module Onboard
   class Repo < Thor
-    attr_reader :g, :path, :branch, :codebase, :projects
+    attr_reader :g, :path, :branch, :codebase, :project
 
     no_tasks do
       def initialize(repo)
@@ -14,14 +15,22 @@ module Onboard
         @g = self.prepare(repo)
         @path = repo['path']
         @branch = repo['branch']
-        @projects = repo['projects']
+        @project = repo['project']
       end
 
-      def st
+      def st(patch = false)
         changed = []
         deleted = []
         untracked = []
 
+        if patch
+          patches_dir = "/tmp/onboard/patches"
+          unless File.directory?(patches_dir)
+            FileUtils.mkdir_p(patches_dir)
+          end
+          patch_file = File.open( "#{patches_dir}/#{Time.now.to_i}_#{project}.patch","w" )
+        end
+
         # TODO: figure out why g.status.changed.keys.each is returning 
         # unchanged files
         g.status.changed.keys.each { |file| changed.push(file.to_s) if !g.diff('HEAD', file).patch.empty? }
@@ -31,25 +40,53 @@ module Onboard
 
         if changed.empty? == false
           say('CHANGED FILES:', :yellow)
-          changed.each { |z| puts g.diff('HEAD', z).patch }
+          changed.each do |x|
+            puts g.diff('HEAD', x).patch
+            if patch
+              patch_file << g.diff('HEAD', x).patch
+            end
+          end
           puts ''
         end
 
         if deleted.empty? == false
           say('DELETED FILES:', :yellow)
-          deleted.each { |x| say(x, :red) }
+          deleted.each do |x|
+            say(x, :red)
+            if patch
+              patch_file << g.diff('--', x).patch
+            end
+          end
           puts ''
         end
 
         if untracked.empty? == false
           say('UNTRACKED FILES:', :yellow)
-          untracked.each { |y| say(y, :red) }
+          untracked.each do |x|
+            say(x, :red)
+            if patch
+              g.add(x)
+              patch_file << g.diff('HEAD', x).patch
+            end
+          end
           puts ''
         end
 
+        if patch
+          patch_file.close
+          Dir.foreach(patches_dir) do |item|
+            file = "#{patches_dir}/#{item}"
+            FileUtils.rm_r file if File.zero?(file)
+          end
+        end
+
         return all
       end
 
+      def co
+        g.checkout_file('HEAD', path)
+      end
+
       def info
         repo = {}
         repo['current_branch'] = g.current_branch
@@ -70,7 +107,7 @@ module Onboard
         g.status.untracked.keys.each { |x| changes.push x }
 
         if changes.empty? == false
-          g.add(path, :all=>true)
+          g.add(codebase, :all=>true)
           g.commit("Add #{project}")
         end
 

data/lib/onboard/version.rb

@@ -1,3 +1,3 @@
 module Onboard
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: onboard
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Nathaniel Hoag
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-04 00:00:00.000000000 Z
+date: 2014-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri