onboard 0.2.1 → 0.2.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTgwMzQzNzYzZTdkM2I4Zjg5OWNlYjIyY2VmMmVkZTQ1ODhhYmJkMA==
+    ZTYzNmVlZDFjMDRmZWViZGVmYzllMTM3MjAzMGZkNjU4NjYwNjc5OA==
   data.tar.gz: !binary |-
-    MDcyODg3MzM0NjAzMDNiY2Q0YTYzYTY3ZmZlNzM4NjkwZDBlMDg2ZQ==
+    YTQwZTBhYmRlZDc2MzRlYmVlZjliY2JiMzI0ZDY3NDY5MTM1M2RmOA==
 SHA512:
   metadata.gz: !binary |-
-    NzY4YjJiYjQxZTVkMTA0ZDY0YWNlOTQyMDFmOTFhOWQwMmIxYTYwYWVhODY2
-    ZWY5ZTY5Yjg4YmJhOGZhMDVmOWI0ZDQwMTkyYzQ0YmRjMTdiNzVhNjcxYWU2
-    ZWJhODJiYmVlN2ViYzUxYTVhZDY3MGNhZjA3Y2JkY2Y1ZTJmZWQ=
+    MTlhMDY5YTc4YTc2MjJmMTJlYzAzMTkwOGVmZTFlOWM0NTEwM2JiN2ViM2E5
+    NzhkMzMwYjcyZWYwOGU4ZjRjM2IyZGFjZjFmMDkwYmZmMGVhNTc5MzJkNjg4
+    ODllNTVlNjI5ODkyMzk2MDcxNjFiZGU3ZDdkODY1MzQ3ZGQzYzQ=
   data.tar.gz: !binary |-
-    Y2M3NmI2Zjg1MzA2MGM2YThlOGZhZDNkMjlhNmRkZmU0OTMwYjIzZGRhZmJh
-    ZjBkMWQ5NThkNTJiMDY5MmJlYmM2MDBmNDhhN2M2MmQ0MjE3NWUyZjM2MDQ0
-    ZDkwOTc1OGRlNzg3ODA2ZDNkNjNhMDM4OGFmNDFiY2FjOGU2YWU=
+    YTllNDkwOTE1ZjJkZmExYzc0NGQyYWIxYWQ0MjM4MThlYTFjMGQ2MTFhZjBj
+    Y2MwMzYwY2EwM2I5MzAyNzNlZmU0ZGZlOTRjMjc2ZWMwM2Q2NjIzM2VmNzM2
+    NjUyNjI4MjVmZmJjMDUzZTE2NDViMmQ4YWNiM2Y5NTUwODYwOWI=

data/lib/onboard/cli.rb

@@ -47,7 +47,7 @@ module Onboard
         say("Projects exist at the following locations:", :yellow)
         found.each do |x, y|
           puts "  " + x
-          projects[File.basename(x)] = y
+          projects[File.basename(x)] = y[0]
         end
         puts ""
       end
@@ -71,24 +71,14 @@ module Onboard
           exit
         end
         prj = {}
+        branch = options[:branch].nil? ? '' : options[:branch]
+        prj['branch'] = branch
         prj['codebase'] = codebase
-        prj['path'] = "#{codebase}/#{path}"
-        prj['projects'] = projects
         prj['core'] = core
+        prj['path'] = path
+        prj['projects'] = projects
+        prj['vc'] = options[:vc]
         Project.new(prj).dl
-        if options[:vc] == true
-          branch = options[:branch].nil? ? '' : options[:branch]
-          repo = {}
-          repo['branch'] = branch
-          repo['codebase'] = codebase
-          repo['projects'] = projects
-          repo['path'] = path
-          Repo.new(repo).update
-        else
-          projects.each do |x, y|
-            say("#{x} added to codebase but changes are not yet tracked in version control.", :yellow)
-          end
-        end
       else
         say("All projects already in codebase.", :yellow)
       end

data/lib/onboard/project.rb

@@ -9,6 +9,7 @@ require 'zlib'
 
 require_relative 'confirm'
 require_relative 'download'
+require_relative 'msg'
 require_relative 'repo'
 
 module Onboard
@@ -18,14 +19,17 @@ module Onboard
   DRUPAL_DL_LINK = "http://ftp.drupal.org/files/projects/"
 
   class Project < Thor
-    attr_reader :core, :path, :projects, :codebase
+    attr_reader :branch, :codebase, :core, :path, :projects, :vc
 
     no_tasks do
       def initialize(args = {})
+        @branch = args['branch']
+        @codebase = args['codebase']
         @core = args['core']
-        @path = args['path']
+        @path = "#{args['codebase']}/#{args['path']}"
         @projects = args['projects']
-        @codebase = args['codebase']
+        @vc = args['vc']
+        @vc_path = args['path']
       end
 
       def feed(project)
@@ -46,14 +50,59 @@ module Onboard
       end
 
       def dl
+        changes = []
         projects.each do |x, y|
-          self.hacked?(x, y[0]) if y.empty? == false
+          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)
-          self.extract(Download.new.path(link)) if self.verify(x, 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
+        end
+        if changes.empty? == false
+          repo = self.build_vc()
+          self.vc_push(repo)
+        end
+      end
+
+      def build_vc(x = '')
+        repo = {}
+        repo['codebase'] = codebase
+        repo['path'] = @vc_path
+        repo['branch'] = branch
+        repo['project'] = x
+        return repo
+      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='')

data/lib/onboard/repo.rb

@@ -4,8 +4,6 @@ require 'git'
 require 'pathname'
 require 'thor'
 
-require_relative 'msg'
-
 module Onboard
   class Repo < Thor
     attr_reader :g, :path, :branch, :codebase, :projects
@@ -63,27 +61,6 @@ module Onboard
         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)
 

data/lib/onboard/version.rb

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

metadata

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