onboard 0.2.3 → 0.3.0

data/lib/onboard/prepare.rb

@@ -0,0 +1,93 @@
+# encoding: utf-8
+
+require 'thor'
+
+require_relative 'confirm'
+require_relative 'project'
+
+module Onboard
+  class Prepare < Thor
+    attr_reader :codebase, :found, :options, :projects
+
+    no_tasks do
+      def initialize(codebase, found, options)
+        @codebase = codebase
+        @found = found
+        @options = options
+        @projects = Hash[options['projects'].map { |k, v| [k, v] }]
+      end
+
+      def report
+        say('Projects exist at the following locations:', :yellow)
+        found.each do |x, y|
+          puts '  ' + x
+          projects[File.basename(x)] = y
+        end
+        puts ''
+        projects
+      end
+
+      def answer
+        if options['no'] == 'no'
+          return 'n'
+        elsif options['yes'] == 'yes'
+          return 'y'
+        else
+          ''
+        end
+      end
+
+      def delete(proj)
+        # TODO: check for patches before delete
+        return proj unless options[:delete] == 'delete'
+        say('Ready to delete existing projects:', :yellow)
+        Confirm.new('Proceed?', true).q(answer)
+        found.each do |x, _|
+          Project.new.clean(x)
+          proj[File.basename(x)] = ''
+        end
+        proj
+      end
+
+      def force(proj)
+        return proj if options[:force] == 'force' || proj.empty?
+        found.each do |x, _|
+          proj.delete(File.basename(x))
+        end
+        proj
+      end
+
+      def add(proj)
+        say('Ready to add the following projects:', :green)
+        proj.each do |x, _|
+          puts '  ' + "#{codebase}/#{options[:destination]}/#{x}"
+        end
+        puts ''
+      end
+
+      def confirm(proj)
+        add(proj)
+        ans = answer
+        Confirm.new('Proceed?', true).q(ans)
+      end
+
+      def void
+        say('All projects already in codebase.', :yellow)
+        exit
+      end
+
+      def do
+        if found.empty? == false
+          proj = report
+          proj = delete(proj)
+        else
+          proj = projects
+        end
+        proj = force(proj)
+        confirm(proj) unless proj.empty?
+        return proj, answer unless proj.empty?
+        void
+      end
+    end
+  end
+end

data/lib/onboard/project.rb

@@ -1,102 +1,89 @@
 # encoding: utf-8
 
 require 'fileutils'
-require 'find'
-require 'nokogiri'
-require 'rubygems/package'
 require 'thor'
-require 'zlib'
 
-require_relative 'confirm'
 require_relative 'download'
-require_relative 'msg'
-require_relative 'repo'
+require_relative 'extract'
+require_relative 'release'
+require_relative 'repo_bridge'
+require_relative 'validate'
 
 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 < Thor
-    attr_reader :branch, :codebase, :core, :path, :projects, :vc
+    attr_reader :answer, :codebase, :core, :options, :path, :projects, :size
 
     no_tasks do
-      def initialize(args = {})
-        @branch = args['branch']
-        @codebase = args['codebase']
-        @core = args['core']
-        @path = "#{args['codebase']}/#{args['path']}"
-        @projects = args['projects']
-        @vc = args['vc']
-        @vc_path = args['path']
+      def initialize(info, projects, options)
+        @answer = info[2]
+        @codebase = info[0]
+        @core = info[1]
+        @options = options
+        @path = "#{codebase}/#{options['destination']}"
+        @projects = projects
+        @size = projects.length
+      end
+
+      def continue?(project, version, latest)
+        return true if version.nil?
+        clean("#{path}/#{project}")
+        repo = build_vc(project)
+        check = Validate.new(project, version, core, answer)
+        if check.latest?(latest) || check.hacked?(path, repo)
+          return false
+        else
+          return true
+        end
       end
 
-      def feed(project)
-        "#{DRUPAL_PRJ_FEED}#{project}/#{core}"
+      def reset(project)
+        clean("#{path}/#{project}")
+        repo = build_vc(project)
+        RepoBridge.new(repo).co
       end
 
-      def hacked?(project, existing)
-        self.clean("#{path}/#{project}")
-        link = self.build_link(project, existing)
+      def deploy(project, version)
+        clean("#{path}/#{project}")
+        link = Download.new.build_link(project, version)
         Download.new.fetch(link)
-        self.extract(Download.new.path(link)) if self.verify(project, link, existing)
-        repo = self.build_vc(project)
-        changes = Repo.new(repo).st(true)
-        if changes.empty? == false
-          return !Confirm.new("Proceed?").yes?
-        else
-          return false
-        end
+        # TODO: retry download after failed download verification
+        Extract.new(Download.new.path(link), link, path).x if Validate.new(project, version, core, answer).verify(link)
       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
+      def push(changes)
+        return false unless changes
+        repo = build_vc
+        RepoBridge.new(repo).push
+      end
+
+      def update(project, changes, count)
+        if options['vc']
+          repo = build_vc(project)
+          update = RepoBridge.new(repo).up
+          changes = changes ? changes : update
+          push(changes) if count == 0
+          return changes
         else
-          return false
+          say("#{project} added to codebase but changes are not yet under version control.", :yellow)
         end
       end
 
-      def build_link(project, version)
-        DRUPAL_DL_LINK + "#{project}-#{version}.tar.gz"
+      def delegate(project, version, changes, count)
+        latest, _md5 = Release.new(project, core).choose
+        if continue?(project, version, latest)
+          deploy(project, latest)
+          return update(project, changes, count)
+        else
+          reset(project)
+        end
       end
 
       def dl
-        changes = []
+        changes = false
+        count = size
         projects.each do |x, y|
-          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
-            self.clean("#{path}/#{x}")
-            repo = self.build_vc(x)
-            Repo.new(repo).co
-          end
-        end
-        if changes.empty? == false
-          repo = self.build_vc()
-          self.vc_push(repo)
+          count -= 1
+          changes = delegate(x, y, changes, count)
         end
       end
 
@@ -104,106 +91,13 @@ module Onboard
         repo = {}
         repo['codebase'] = codebase
         repo['path'] = @vc_path
-        repo['branch'] = branch
         repo['project'] = x
-        return repo
-      end
-
-      def vc_co(args)
-        Repo.new(args).co
-      end
-
-      def vc_up(args)
-        g = Repo.new(args)
-        info = g.info
-        changes = []
-        msg = "Committing #{args['project']} on #{info['current_branch']} branch..."
-        Msg.new(msg).format
-        changes = g.commit("#{args['path']}/#{args['project']}")
-        if changes.empty? == false
-          say("  [done]", :green)
-        else
-          puts "\nNo changes to commit for #{args['project']}"
-        end
-        return changes
-      end
-
-      def vc_push(args)
-        g = Repo.new(args)
-        info = g.info
-        msg = "Pushing all changes to #{info['remotes'][0]}..."
-        Msg.new(msg).format
-        g.push
-        say("  [done]", :green)
-      end
-
-      def verify(x, file, version='')
-        md5, version = self.release(x, version)
-        if md5 == Digest::MD5.file(Download.new.path(file)).hexdigest
-          return true
-        else
-          say("Verification failed for #{x} download!", :red)
-          exit
-        end
-      end
-
-      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('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('version').content
-            end
-          end
-        end
-        if releases.nil?
-          doc.xpath('//releases//release').each do |item|
-            releases[item.at_xpath('mdhash').content] = item.at_xpath('version').content
-          end
-        end
-        return releases.first
+        repo
       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
   end
 end
-

data/lib/onboard/release.rb

@@ -0,0 +1,56 @@
+# encoding: utf-8
+
+require 'nokogiri'
+
+require_relative 'download'
+
+module Onboard
+  DRUPAL_PRJ_FEED = 'http://updates.drupal.org/release-history/'
+
+  class Release
+    attr_reader :core, :doc, :feed, :project
+
+    def initialize(project, core)
+      @core = core
+      @project = project
+      @doc = build_doc
+    end
+
+    def build_doc
+      feed = "#{DRUPAL_PRJ_FEED}#{project}/#{core}"
+      Download.new.fetch(feed)
+      xml = File.open(Download.new.path(feed))
+      Nokogiri::XML(xml)
+    end
+
+    def specify(version, releases)
+      if releases['stable'][version].nil? == false
+        return version, releases['stable'][version]
+      elsif releases['extra'][version].nil? == false
+        return version, releases['extra'][version]
+      end
+    end
+
+    def choose(version = '')
+      releases = releases_get
+      if version.empty? == false
+        return specify(version, releases)
+      elsif releases['stable'].empty? == false
+        return releases['stable'].first
+      elsif releases['extra'].empty? == false
+        return releases['extra'].first
+      end
+    end
+
+    def releases_get
+      releases = { 'stable' => {}, 'extra' => {} }
+      doc.xpath('//releases//release').each do |item|
+        md5 = item.at_xpath('mdhash').content
+        version = item.at_xpath('version').content
+        status = item.at_xpath('version_extra').nil? ? 'stable' : 'extra'
+        releases[status][version] = md5
+      end
+      releases
+    end
+  end
+end

data/lib/onboard/repo.rb

@@ -5,82 +5,70 @@ require 'git'
 require 'pathname'
 require 'thor'
 
+require_relative 'patch'
+
 module Onboard
   class Repo < Thor
-    attr_reader :g, :path, :branch, :codebase, :project
+    attr_reader :g, :path, :codebase, :project
 
     no_tasks do
       def initialize(repo)
         @codebase = repo['codebase']
-        @g = self.prepare(repo)
+        @g = prepare(repo)
         @path = repo['path']
-        @branch = repo['branch']
         @project = repo['project']
       end
 
-      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? }
-        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
-
-        if changed.empty? == false
-          say('CHANGED FILES:', :yellow)
-          changed.each do |x|
-            puts g.diff('HEAD', x).patch
-            if patch
-              patch_file << g.diff('HEAD', x).patch
-            end
-          end
-          puts ''
+      def changed(list, patch_file, patch)
+        return false if list.empty?
+        say('CHANGED FILES:', :yellow)
+        list.each do |x|
+          puts g.diff('HEAD', x).patch
+          patch_file << g.diff('HEAD', x).patch if patch
         end
+      end
 
-        if deleted.empty? == false
-          say('DELETED FILES:', :yellow)
-          deleted.each do |x|
-            say(x, :red)
-            if patch
-              patch_file << g.diff('--', x).patch
-            end
-          end
-          puts ''
+      def deleted(list, patch_file, patch)
+        return false if list.empty?
+        say('DELETED FILES:', :yellow)
+        list.each do |x|
+          say(x, :red)
+          patch_file << g.diff('--', x).patch if patch
         end
+      end
 
-        if untracked.empty? == false
-          say('UNTRACKED FILES:', :yellow)
-          untracked.each do |x|
-            say(x, :red)
-            if patch
-              g.add(x)
-              patch_file << g.diff('HEAD', x).patch
-            end
+      def untracked(list, patch_file, patch)
+        return false if list.empty?
+        say('UNTRACKED FILES:', :yellow)
+        list.each do |x|
+          say(x, :red)
+          if patch
+            g.add(x)
+            patch_file << g.diff('HEAD', x).patch
           end
-          puts ''
         end
+      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
+      def repo_status
+        all = {}
+        all['changed'] = []
+        all['deleted'] = []
+        all['untracked'] = []
+        g.status.changed.keys.each { |file| all['changed'].push(file.to_s) unless g.diff('HEAD', file).patch.empty? }
+        g.status.deleted.keys.each { |file| all['deleted'].push(file.to_s) }
+        g.status.untracked.keys.each { |file| all['untracked'].push(file.to_s) }
+        all
+      end
 
-        return all
+      def st(patch = false)
+        patch_file = Patch.new.open(project) if patch
+        # TODO: figure out why g.status.changed.keys.each is returning unchanged files
+        all = repo_status
+        changed(all['changed'], patch_file, patch)
+        deleted(all['deleted'], patch_file, patch)
+        untracked(all['untracked'], patch_file, patch)
+        Patch.new.close(patch_file)
+        all.empty? ? false : true
       end
 
       def co
@@ -91,7 +79,7 @@ module Onboard
         repo = {}
         repo['current_branch'] = g.current_branch
         repo['remotes'] = g.remotes
-        return repo
+        repo
       end
 
       def prepare(args)
@@ -102,16 +90,16 @@ module Onboard
         project = File.basename(path)
 
         changes = []
-        g.status.changed.keys.each { |x| changes.push x if !g.diff('HEAD', x).patch.empty? }
+        g.status.changed.keys.each { |x| changes.push x unless 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(codebase, :all=>true)
+          g.add(codebase, :all => true)
           g.commit("Add #{project}")
         end
 
-        return changes
+        changes
       end
 
       def push
@@ -120,4 +108,3 @@ module Onboard
     end
   end
 end
-

data/lib/onboard/repo_bridge.rb

@@ -0,0 +1,43 @@
+# encoding: utf-8
+
+require 'thor'
+
+require_relative 'msg'
+require_relative 'repo'
+
+module Onboard
+  class RepoBridge < Thor
+    attr_reader :args, :g, :info
+
+    no_tasks do
+      def initialize(args = {})
+        @args = args
+        @g = Repo.new(args)
+        @info = g.info
+      end
+
+      def co
+        g.co
+      end
+
+      def up
+        msg = "Committing #{args['project']} on #{info['current_branch']} branch..."
+        Msg.new(msg).format
+        changes = g.commit("#{args['path']}/#{args['project']}")
+        if changes.empty? == false
+          say('  [done]', :green)
+        else
+          puts "\nNo changes to commit for #{args['project']}"
+        end
+        changes
+      end
+
+      def push
+        msg = "Pushing all changes to #{info['remotes'][0]}..."
+        Msg.new(msg).format
+        g.push
+        say('  [done]', :green)
+      end
+    end
+  end
+end

data/lib/onboard/screen.rb

@@ -4,12 +4,10 @@ require 'io/console'
 
 module Onboard
   class Screen
-
     def size
       IO.console.winsize
       rescue LoadError
-      [Integer(`tput li`), Integer(`tput co`)]
+        [Integer(`tput li`), Integer(`tput co`)]
     end
   end
 end
-

data/lib/onboard/source.rb

@@ -0,0 +1,18 @@
+#!/usr/bin/env ruby
+
+require 'git'
+
+module Onboard
+  class Source
+    attr_reader :source
+
+    no_tasks do
+      def initialize(source)
+        @source = source
+      end
+
+      def get
+      end
+    end
+  end
+end