ebm 0.0.14 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
-SHA1: 
-  metadata.gz: 6ed5b9bfdba6c7db8b4b75cee27af82e801591a2
-  data.tar.gz: 39ef0f6362ad6d0cb15394ac6e2bde14bdc2b65f
 SHA512: 
-  metadata.gz: 13933f2f82ea3277ccce683366f838f84f6c1d5b4d16b429c308a956b6024eda9e42cd726adac06f122648c17102246fc642f700b3f2236851be2f51ee1a6761
-  data.tar.gz: b8a2f41f613527ed54f8f77d9c51be69cebe44e86c3749d6537e70e04dd9dcda332486f6a57a15c69818505d8f6c23884cbf54d033f7662abab5e9cec2160649
+  metadata.gz: f7b603272b2c9fc59edce589b9c11b4e5782d1edcf898b396e15f3fef9fb7dbbbd0fea03e9d0483bef301e96e8fc4dac1a03d530c99a37bb518946b850ae73d9
+  data.tar.gz: 00de09579c0f9729536c6c63e613b3ec6014e07421ec518610379cc9e8165c4a3a0168356c681e4f0e436ec4eb2460676e3309321e8d32cb01128b1266dcf5a4
+SHA1: 
+  metadata.gz: c749515fc92f8758856798292830057d2299b95c
+  data.tar.gz: 51601bc0d48c15c7b2b29e57e165a09f8c619f29

data/lib/commands/pull.rb

@@ -29,6 +29,10 @@ module Commands
         options[:tag] = v
       end
 
+      opts.on("--remote_version", "Pull from remote version branch into your current branch.") do |v|
+        options[:remote_version] = v
+      end
+
     end
 
     def run(global_options)
@@ -36,10 +40,14 @@ module Commands
       # see if we can open the config file - we append the .config suffix
       # the file is expected to be in JSON format
       tag = options[:tag]
-      force = options[:force]
+      remote_version = options[:remote_version]
 
       if ARGV.length > 0
-        raise "You must specify all arguments with their options. You probably meant to use -b for the branch"
+        raise "You must specify all arguments with their options."
+      end
+
+      if (!tag.nil? && !remote_version.nil?)
+        raise "You can't specify both a pull from a tag and a pull from a remote version branch together."
       end
 
       # determine config_name by extracting parent of our directory
@@ -56,6 +64,7 @@ module Commands
         if repo[:create_dev_branch]
           repo_name = EbmSharedLib.get_repo_name(repo[:git_path])
           repo_path = "#{top_dir}/#{repo_name}"
+          branch = repo[:branch]
           puts("\n#{repo_name} pull:\n");
 
           cmd = "git fetch --all"
@@ -70,8 +79,13 @@ module Commands
               raise "Git checkout failed for #{repo_name}."
             end
           else
-            # use a normal pull from the specified remote repo
-            cmd = "git pull"
+            if remote_version
+              # pulling from remote version branch
+              cmd = "git pull origin #{branch}"
+            else
+              # pull from the remote branch of the current branch
+              cmd = "git pull"
+            end
             if EbmSharedLib::CL.do_cmd_result(cmd, repo_path) != 0
               raise "Git pull failed for #{repo_name}."
             end

data/lib/commands/tag.rb

@@ -34,6 +34,10 @@ module Commands
         options[:delete] = v
       end
 
+      opts.on("--commit_and_push", "Commit any local changes and then push the remote - should only be used by the build system.") do |v|
+        options[:commit_and_push] = v
+      end
+
     end
 
     def run(global_options)
@@ -41,7 +45,12 @@ module Commands
       # see if we can open the config file - we append the .config suffix
       # the file is expected to be in JSON format
       tag = options[:tag]
-      delete_tag = options[:delete]
+      delete_tag = !!options[:delete]
+      commit_and_push = !!options[:commit_and_push]   # the !! forces conversion to a boolean
+
+      if (commit_and_push && delete_tag)
+        raise "You cannot use --commit_and_push with --delete."
+      end
 
       # determine config_name by extracting our directory
       config_name = EbmSharedLib.config_name_from_dir(Dir.pwd)
@@ -60,15 +69,34 @@ module Commands
         if repo[:taggable]
           repo_name = EbmSharedLib.get_repo_name(repo[:git_path])
           repo_path = "#{top_dir}/#{repo_name}"
-          if delete_tag == true
+          if delete_tag
             cmd = "git tag -d #{tag} && git push origin :refs/tags/#{tag}"
           else
+            if commit_and_push
+              # they want to commit whatever has changed and push to current remote
+              # first grab the current branch name
+              cmd = "git symbolic-ref HEAD"
+              result = EbmSharedLib::CL.do_cmd_output(cmd, repo_path)
+              if $?.exitstatus != 0
+                raise "Unable to get the current branch for #{repo_name}, you may be on a detached HEAD."
+              end
+              branch = result.rstrip.split("/").last
+
+              # we have the local branch so now commit and push to the remote branch
+              cmd = "git commit -am \"Committing changes via ebm tag --commit_and_push for tag #{tag}.\""
+              EbmSharedLib::CL.do_cmd_result(cmd, repo_path) # ignore any error
+
+              # now push what we just committed
+              cmd = "git push origin #{branch}"
+              if EbmSharedLib::CL.do_cmd_result(cmd, repo_path) != 0
+                raise "Push failed failed for #{repo_name}."
+              end
+            end
             cmd = "git tag #{tag} && git push origin refs/tags/#{tag}"
+            if EbmSharedLib::CL.do_cmd_result(cmd, repo_path) != 0
+              raise "Tagging operation failed for #{repo_name}.  Make sure you are in the top level #{config_name} directory."
+            end
           end
-          if EbmSharedLib::CL.do_cmd_result(cmd, repo_path) != 0
-            raise "Tagging operation failed for #{repo_name}.  Make sure you are in the top level #{config_name} directory."
-          end
-
         end
       end
 

data/lib/ebmsharedlib/utilities.rb

@@ -40,6 +40,23 @@ module EbmSharedLib
     def self.do_cmd_result(cmd, dir=nil)
       do_cmd(cmd, dir)
     end
+
+    # run a command and return the output string
+    def self.do_cmd_output(cmd, dir=nil)
+      exit_code = 0
+      result = ""
+
+      if dir.nil? == false
+        Dir.chdir(dir){
+          result = `#{cmd}`
+        }
+      else
+        result = `#{cmd}`
+      end
+
+      result
+    end
+
   end
 
   def self.prepare_config_repo

data/lib/info.rb

@@ -7,6 +7,6 @@
 #
 class Info
   def self.version
-    "0.0.14"
+    "0.0.15"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ebm
 version: !ruby/object:Gem::Version 
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors: 
 - Greg Seitz
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-06-25 00:00:00 Z
+date: 2013-06-26 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: subcommand