onboard 0.2.0 → 0.2.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDFmNjkwZDVlMGFmMmI1NjYzY2I5OGZmMTgwNzRiYjkwMjBlNGI3YQ==
+    OTgwMzQzNzYzZTdkM2I4Zjg5OWNlYjIyY2VmMmVkZTQ1ODhhYmJkMA==
   data.tar.gz: !binary |-
-    NWMyMTdkYTYwNTdmOWM0NDkyZTc3ZGQyMTEwMjJiYzM3MTcyNDE2Ng==
+    MDcyODg3MzM0NjAzMDNiY2Q0YTYzYTY3ZmZlNzM4NjkwZDBlMDg2ZQ==
 SHA512:
   metadata.gz: !binary |-
-    NWRkOTUyMzMxOTJjMGY2MDJmZDQxZDEyMDkxYjJkM2RhNmE0N2ZmM2I3YjE4
-    YTBlMGM1ODg5ZGRlM2UxZThkODkxNWM0ZWI2MjAxZTUxNzY0MTRjYWJiMjFi
-    NjYyZmNhYmI4OTQ2NzM3MWRjNzA1NTg4YTFiYWI1MmRiNzhmNjQ=
+    NzY4YjJiYjQxZTVkMTA0ZDY0YWNlOTQyMDFmOTFhOWQwMmIxYTYwYWVhODY2
+    ZWY5ZTY5Yjg4YmJhOGZhMDVmOWI0ZDQwMTkyYzQ0YmRjMTdiNzVhNjcxYWU2
+    ZWJhODJiYmVlN2ViYzUxYTVhZDY3MGNhZjA3Y2JkY2Y1ZTJmZWQ=
   data.tar.gz: !binary |-
-    MzQ3NzYwOWNiODMxNzJhNWViZDljODcyOTQyNzk3NWIzOWIzYWIwMzc3ODYw
-    NjNhZTkxNmFkNTgxMTU3MjQ1OGU3YTcyYmIwNTg2OTc4YjBhYTA2NDg4YWQ2
-    ZGJhMjcxODhhM2QyY2MyZTc0YjdjMmE3YjExYTYyZTcwZGEzOGM=
+    Y2M3NmI2Zjg1MzA2MGM2YThlOGZhZDNkMjlhNmRkZmU0OTMwYjIzZGRhZmJh
+    ZjBkMWQ5NThkNTJiMDY5MmJlYmM2MDBmNDhhN2M2MmQ0MjE3NWUyZjM2MDQ0
+    ZDkwOTc1OGRlNzg3ODA2ZDNkNjNhMDM4OGFmNDFiY2FjOGU2YWU=

data/bin/onboard

@@ -1,5 +1,8 @@
 #!/usr/bin/env ruby
 
+lib = File.expand_path(File.dirname(__FILE__) + '/../lib')
+$LOAD_PATH.unshift(lib) if File.directory?(lib) && !$LOAD_PATH.include?(lib)
+
 require 'onboard'
 
 Onboard::CLI.start(ARGV)

data/lib/onboard/cli.rb

@@ -10,7 +10,6 @@ require_relative 'repo'
 
 module Onboard
   class CLI < Thor
-    # TODO: switch from DOCROOT to CODEBASE to enable more comprehensive searching
     desc "projects CODEBASE", "add projects to CODEBASE"
     long_desc <<-LONGDESC
       `onboard projects` performs multiple tasks when installing contrib
@@ -23,8 +22,6 @@ module Onboard
       * Adds and commits each project
 
     LONGDESC
-    # 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 :path, :required => true, :aliases => "-p", :desc => "Specify project path relative to CODEBASE"
@@ -38,27 +35,32 @@ module Onboard
     option :yes, :aliases => "-y", :desc => "Assume 'yes' for all prompts"
     def projects(codebase)
       core = "#{options[:core]}.x"
-      projects = []
+      projects = {}
       if options[:modules].nil? == false
-        options[:modules].each { |x| projects.push x }
+        options[:modules].each { |x| projects[x] = '' }
       elsif options[:themes].nil? == false
-        options[:themes].each { |x| projects.push x }
+        options[:themes].each { |x| projects[x] = '' }
       end
       path = "#{options[:path]}"
       found = Finder.new(projects, codebase).locate
-      if found.any?
+      if found.empty? == false
         say("Projects exist at the following locations:", :yellow)
-        found.each { |x| puts "  " + x }
+        found.each do |x, y|
+          puts "  " + x
+          projects[File.basename(x)] = y
+        end
         puts ""
       end
       if options[:force] != 'force'
-        found.each do |x|
-          projects.delete(File.basename(x))
+        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|
+        projects.each do |x, y|
           puts "  " + "#{codebase}/#{path}/#{x}"
         end
         puts ""
@@ -68,53 +70,22 @@ module Onboard
           say("Script was exited.")
           exit
         end
-        projects.each do |x|
-          prm = {}
-          prm['path'] = "#{codebase}/#{path}/#{x}"
-          Project.new(prm).rm
-          # TODO: replace 'open().read' with custom caching solution
-          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
-          uri = URI.parse(archive)
-          targz = "/tmp/open-uri-503" + [ @path, uri.host, Digest::SHA1.hexdigest(archive) ].join('/')
-          md5 = Digest::MD5.file(targz).hexdigest
-          # TODO: retry download after failed download verification
-          if md5 == feed_md5
-            pex = {}
-            pex['dest'] = "#{codebase}/#{path}"
-            pex['path'] = targz 
-            Project.new(pex).extract
-          else
-            say("Verification failed for #{x} archive!", :red)
-            exit
-          end
-        end
+        prj = {}
+        prj['codebase'] = codebase
+        prj['path'] = "#{codebase}/#{path}"
+        prj['projects'] = projects
+        prj['core'] = core
+        Project.new(prj).dl
         if options[:vc] == true
-          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)
+          repo['projects'] = projects
+          repo['path'] = path
+          Repo.new(repo).update
         else
-          projects.each do |x|
+          projects.each do |x, y|
             say("#{x} added to codebase but changes are not yet tracked in version control.", :yellow)
           end
         end

data/lib/onboard/download.rb

@@ -0,0 +1,25 @@
+# encoding: utf-8
+
+require 'net/http'
+
+module Onboard
+  class Download
+    def initialize(cache_dir='/tmp')
+      @cache_dir = cache_dir
+    end
+
+    def path(url)
+      File.join("", @cache_dir, Digest::MD5.hexdigest(url))
+    end
+
+    def fetch(url, max_age=1800)
+      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
+      end
+      File.open(file_path, "w") do |data|
+        data << Net::HTTP.get_response(URI.parse(url)).body
+      end
+    end
+  end
+end

data/lib/onboard/find.rb

@@ -12,20 +12,38 @@ module Onboard
     end
 
     def locate
-      found = []
+      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
+          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
       end
+      return found
+    end
+
+    def info_ext?(file)
+      File.extname(file) == '.info'
+    end
 
-      return found.uniq
+    def version(file)
+      File.open(file) do |g|
+        g.each_line do |line|
+          if line =~ /version/
+            return line.scan(/.*?"(.*?)".*$/)[0].nil? ? '' : line.scan(/.*?"(.*?)".*$/)[0]
+          end
+        end
+      end
     end
   end
 end

data/lib/onboard/msg.rb

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

data/lib/onboard/project.rb

@@ -1,65 +1,125 @@
 # encoding: utf-8
+
 require 'fileutils'
 require 'find'
 require 'nokogiri'
 require 'rubygems/package'
+require 'thor'
 require 'zlib'
 
+require_relative 'confirm'
+require_relative 'download'
+require_relative 'repo'
+
 module Onboard
 
   TAR_LONGLINK = '././@LongLink'
+  DRUPAL_PRJ_FEED = "http://updates.drupal.org/release-history/"
+  DRUPAL_DL_LINK = "http://ftp.drupal.org/files/projects/"
 
-  class Project
-    attr_reader :feed, :path, :dest
+  class Project < Thor
+    attr_reader :core, :path, :projects, :codebase
 
-    def initialize(args = {})
-      @feed = "http://updates.drupal.org/release-history/#{args['project']}/#{args['core']}"
-      @path = args['path']
-      @dest = args['dest']
-    end
+    no_tasks do
+      def initialize(args = {})
+        @core = args['core']
+        @path = args['path']
+        @projects = args['projects']
+        @codebase = args['codebase']
+      end
+
+      def feed(project)
+        "#{DRUPAL_PRJ_FEED}#{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
+      def hacked?(project, existing)
+        self.clean("#{path}/#{project}")
+        link = DRUPAL_DL_LINK + project + "-" + existing + ".tar.gz"
+        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
+        if changes.empty? == false
+          Confirm.new("Proceed?").yes?
         end
       end
-      if releases.nil?
-        doc.xpath('//releases//release').each do |item|
-          releases[item.at_xpath('mdhash').content] = item.at_xpath('download_link').content
+
+      def dl
+        projects.each do |x, y|
+          self.hacked?(x, y[0]) if y.empty? == false
+          self.clean("#{path}/#{x}")
+          md5, link = self.release(x)
+          Download.new.fetch(link)
+          self.extract(Download.new.path(link)) if self.verify(x, link)
+          # TODO: retry download after failed download verification
         end
       end
-      return releases.first
-    end
 
-    def rm
-      FileUtils.rm_r path if File.directory?(path)
-    end
+      def verify(x, file, version='')
+        md5, link = self.release(x, version)
+        if md5 == Digest::MD5.file(Download.new.path(file)).hexdigest
+          return true
+        else
+          say("Verification failed for #{project} download!", :red)
+          exit
+        end
+      end
 
-    def extract
-      Gem::Package::TarReader.new( Zlib::GzipReader.open path ) do |tar|
-        dst = nil
-        tar.each do |entry|
-          if entry.full_name == TAR_LONGLINK
-            dst = File.join dest, entry.read.strip
-            next
+      def release(project, version='')
+        feed = self.feed(project)
+        Download.new.fetch(feed)
+        xml = File.open(Download.new.path(feed))
+        doc = Nokogiri::XML(xml)
+        releases = {}
+        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
+            end
           end
-          dst ||= File.join dest, entry.full_name
-          if entry.directory?
-            FileUtils.rm_rf dst unless File.directory? dst
-            FileUtils.mkdir_p dst, :mode => entry.header.mode, :verbose => false
-          elsif entry.file?
-            FileUtils.rm_rf dst unless File.file? dst
-            File.open dst, "wb" do |f|
-              f.print entry.read
+        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
             end
-            FileUtils.chmod entry.header.mode, dst, :verbose => false
-          elsif entry.header.typeflag == '2' #Symlink!
-            File.symlink entry.header.linkname, dst
           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 clean(arg)
+        FileUtils.rm_r arg if File.directory?(arg)
+      end
+
+      def extract(archive)
+        Gem::Package::TarReader.new( Zlib::GzipReader.open archive ) do |tar|
           dst = nil
+          tar.each do |entry|
+            if entry.full_name == TAR_LONGLINK
+              dst = File.join path, entry.read.strip
+              next
+            end
+            dst ||= File.join path, entry.full_name
+            if entry.directory?
+              FileUtils.rm_rf dst unless File.directory? dst
+              FileUtils.mkdir_p dst, :mode => entry.header.mode, :verbose => false
+            elsif 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
+            elsif entry.header.typeflag == '2' #Symlink!
+              File.symlink entry.header.linkname, dst
+            end
+            dst = nil
+          end
         end
       end
     end

data/lib/onboard/repo.rb

@@ -1,52 +1,109 @@
 #!/usr/bin/env ruby
 
-# TODO: Watch for updates to rugged that enable git push
 require 'git'
 require 'pathname'
+require 'thor'
+
+require_relative 'msg'
 
 module Onboard
-  class Repo
-    attr_reader :g, :path, :branch
-
-    def initialize(repo)
-      @codebase = repo['codebase']
-      @g = self.prepare(repo)
-      @path = repo['path']
-      @branch = repo['branch']
-    end
+  class Repo < Thor
+    attr_reader :g, :path, :branch, :codebase, :projects
 
-    def info
-      repo = {}
-      repo['current_branch'] = g.current_branch
-      repo['remotes'] = g.remotes
-      return repo
-    end
+    no_tasks do
+      def initialize(repo)
+        @codebase = repo['codebase']
+        @g = self.prepare(repo)
+        @path = repo['path']
+        @branch = repo['branch']
+        @projects = repo['projects']
+      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 st
+        changed = []
+        deleted = []
+        untracked = []
+
+        # 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? }
+        g.status.deleted.keys.each { |file| deleted.push(file.to_s) }
+        g.status.untracked.keys.each { |file| untracked.push(file.to_s) }
+        all = changed + deleted + untracked
 
-    def update
-      project = File.basename(path)
+        if changed.empty? == false
+          say('CHANGED FILES:', :yellow)
+          changed.each { |z| puts g.diff('HEAD', z).patch }
+          puts ''
+        end
 
-      changes = []
-      g.status.changed.keys.each { |x| changes.push x }
-      g.status.deleted.keys.each { |x| changes.push x }
-      g.status.untracked.keys.each { |x| changes.push x }
+        if deleted.empty? == false
+          say('DELETED FILES:', :yellow)
+          deleted.each { |x| say(x, :red) }
+          puts ''
+        end
 
-      if changes.nil? == false
-        g.add(path, :all=>true)
-        g.commit("Add #{project}")
-      else
-        puts "No changes to commit for #{project}"
+        if untracked.empty? == false
+          say('UNTRACKED FILES:', :yellow)
+          untracked.each { |y| say(y, :red) }
+          puts ''
+        end
+
+        return all
       end
-    end
 
-    def push
-      g.push
+      def info
+        repo = {}
+        repo['current_branch'] = g.current_branch
+        repo['remotes'] = g.remotes
+        return repo
+      end
+
+      def prepare(args)
+        Git.open((Pathname.new(args['codebase'])).to_s)
+      end
+
+      def update
+        info = self.info
+        changes = []
+        projects.each do |x, y|
+          msg = "Committing #{x} on #{info['current_branch']} branch..."
+          Msg.new(msg).format
+          changes = self.commit("#{path}/#{x}")
+          if changes.empty? == false
+            say("  [done]", :green)
+          else
+            puts "\nNo changes to commit for #{x}"
+          end
+        end
+        if changes.empty? == false
+          msg = "Pushing all changes to #{info['remotes'][0]}..."
+          Msg.new(msg).format
+          self.push
+          say("  [done]", :green)
+        end
+      end
+
+      def commit(path)
+        project = File.basename(path)
+
+        changes = []
+        g.status.changed.keys.each { |x| changes.push x if !g.diff('HEAD', x).patch.empty? }
+        g.status.deleted.keys.each { |x| changes.push x }
+        g.status.untracked.keys.each { |x| changes.push x }
+
+        if changes.empty? == false
+          g.add(path, :all=>true)
+          g.commit("Add #{project}")
+        end
+
+        return changes
+      end
+
+      def push
+        g.push
+      end
     end
   end
 end
+

data/lib/onboard/screen.rb

@@ -1,13 +1,15 @@
 #!/usr/bin/env ruby
 
-require 'curses'
+require 'io/console'
 
 module Onboard
   class Screen
-    Curses.init_screen()
 
-    def width
-      return Curses.cols
+    def size
+      IO.console.winsize
+      rescue LoadError
+      [Integer(`tput li`), Integer(`tput co`)]
     end
   end
 end
+

data/lib/onboard/version.rb

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

data/onboard.gemspec

@@ -17,7 +17,6 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
   spec.add_dependency "nokogiri", "~> 1.6"
-  spec.add_dependency "open-uri-cached", [">= 0.0.5", "< 2"]
   spec.add_dependency "git", "~> 1.2"
   spec.add_dependency "thor", [">= 0.19.1", "< 2"]
   spec.add_development_dependency "bundler", "~> 1.6"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: onboard
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Nathaniel Hoag
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-24 00:00:00.000000000 Z
+date: 2014-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -24,26 +24,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
-- !ruby/object:Gem::Dependency
-  name: open-uri-cached
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.0.5
-    - - <
-      - !ruby/object:Gem::Version
-        version: '2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.0.5
-    - - <
-      - !ruby/object:Gem::Version
-        version: '2'
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement
@@ -123,6 +103,7 @@ files:
 - lib/onboard.rb
 - lib/onboard/cli.rb
 - lib/onboard/confirm.rb
+- lib/onboard/download.rb
 - lib/onboard/find.rb
 - lib/onboard/msg.rb
 - lib/onboard/project.rb