qb 0.1.37 → 0.1.38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cafbcb81c0a8179b326824b5b89203534604398c
-  data.tar.gz: 46823f3b27926e4c5652f4fac6b2932d3d74250a
+  metadata.gz: b3db6c782539a18c0595a06811de825a145c6554
+  data.tar.gz: 9b0f932cbf62a32649e8742fd7e1d273fbda591e
 SHA512:
-  metadata.gz: b6d08dab932b56a417c31fd56dd3584d8cf6874f6f467dcd22e575806fe39e8894fa447905f18258023be19a0f2c0b17389d1bdb941397058b63f567180fdb8c
-  data.tar.gz: 3167ccdd9f411767e2302c58adf8d697e428c7515d5c30502e645fe4c43a2d707d34e99fe2c77850c45e77b0607f33dff6bde49744de9ea855ecc48cea16daa0
+  metadata.gz: 005c10da52d51cf20e1624d59622471944f3358b5f3f747e2e471ce4f598c90ee3aba9f2039e0997aca4857b3273c311759f9676f71493127ea3e2754562cde4
+  data.tar.gz: e4c764c6a9cbed12327362e497c608174f2e6c28e88b5ccb52054214c7b18813564b4fb6a1800e709c9205ea5cb976312ca49ecf7fc5e5152c01e7c1f13842e1

data/lib/qb/util/stdio.rb

@@ -73,12 +73,12 @@ module QB::Util::STDIO
       # 
       debug "closing..."
       
-      @thread.kill
-      @socket.close
+      @thread.kill unless @thread.nil?
+      @socket.close unless @socket.nil?
       @socket = nil
-      @server.close
+      @server.close unless @server.nil?
       @server = nil
-      FileUtils.rm @path
+      FileUtils.rm(@path) if @path.exist?
       
       debug "closed."
     end

data/lib/qb/version.rb

@@ -1,7 +1,7 @@
 module QB
   GEM_NAME = 'qb'
   
-  VERSION = "0.1.37"
+  VERSION = "0.1.38"
   
   def self.gemspec
     Gem.loaded_specs[GEM_NAME]

data/roles/qb.git_submodule_update/library/git_submodule_update

@@ -17,6 +17,8 @@ require 'qb'
 require 'cmds'
 require 'nrser'
 
+using NRSER
+
 class GitSubmoduleUpdate < QB::AnsibleModule
   def main_dir
     File.realpath @args['dir']
@@ -44,7 +46,7 @@ class GitSubmoduleUpdate < QB::AnsibleModule
         detached: detached?(dir),
         dirty: dirty?(dir),
       }
-    }
+    }.tap {|subs| QB.debug submodules: subs}
   end
   
   def dirty? repo_dir
@@ -83,6 +85,8 @@ class GitSubmoduleUpdate < QB::AnsibleModule
   end
   
   def attach! submodule
+    QB.debug "attaching submodule #{ submodule[:rel_dir] }..."
+    
     branch_heads = branch_heads_for_commit submodule
     branch_head = nil
     
@@ -95,62 +99,88 @@ class GitSubmoduleUpdate < QB::AnsibleModule
       # automatically update it because that might break shit.
       # 
       # do nothing
+      puts <<-END.squish
+        submodule #{ submodule[:rel_dir] } points to commit
+        #{ submodule[:commit] } that is not the head of any branch.
+      END
+      
       return false
+      
     when 1
-      # commit is head of only one branch
+      QB.debug "commit is head of only one branch: #{ branch_heads[0][:ref] }"
       branch_head = branch_heads[0]
+      
     else
-      # commit is head of multiple branches
+      QB.debug "commit is head of multiple branches..."
+      
       local = branch_heads.select {|bh| bh[:ref].start_with? 'refs/heads'}
       
       case local.length
       when 0
-        # commit is head of multiple remote branches
+        QB.debug "commit is head of multiple remote branches..."
+        
         # see if one is master
         branch_head = branch_heads.find {|bh| bh[:ref].end_with? 'master'}
         
         # if none do we're hosed - not sure which one it should be on
         if branch_head.nil?
-          raise NRSER.squish <<-END
+          puts <<-END.squish
             submodule #{ submodule[:rel_dir] } points to commit
             #{ submodule[:commit] } that heads multiple non-master remote
             branches: #{ branch_heads.map {|bh| bh[:ref]} }
           END
+          
+          return false
         end
         
+        QB.debug "commit is head of local master, using that."
+        
       when 1
-        # the commit is head of one local branch, use it
+        QB.debug "the commit is head of one local branch, using it."
+        
         branch_head = local[0]
       
       else
-        # the commit heads multiple local branches
+        QB.debug "the commit heads multiple local branches..."
+        
         # again, see if one is master
         branch_head = local.find {|b| b[:ref].end_with? 'master'}
         
         # if none do we're hosed - not sure which one it should be on
         if branch_head.nil?
-          raise NRSER.squish <<-END
+          puts <<-END.squish
             submodule #{ submodule[:rel_dir] } points to commit
             #{ submodule[:commit] } that heads multiple non-master local
             branches: #{ local.map {|bh| bh[:ref]} }
           END
+          
+          return false
         end
-      end # case
-    end
+        
+        QB.debug "commit is head of remote master, using that."
+      end # case local.length
+    end # case branch_heads.length
+    
+    QB.debug "attaching #{ submodule[:rel_dir] } to #{ branch_head[:ref] }..."
     
     branch = branch_head[:ref].split('/')[-1]
     
     Dir.chdir submodule[:dir] do
-      # checkout the branch
+      QB.debug "checking out branch #{ branch } for #{ submodule[:rel_dir] }..."
+      
       Cmds! "git checkout <%= branch %>", branch: branch
       
       # do a pull if the head was on the remote
       if branch_head[:ref].start_with? 'refs/remotes'
+        QB.debug "commit is head of remote branch, pulling..."
+        
         Cmds! "git pull origin <%= branch %>", branch: branch
       end
     end
     
+    QB.debug "attached."
     @changed = true
+    true
   end
   
   def main

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qb
 version: !ruby/object:Gem::Version
-  version: 0.1.37
+  version: 0.1.38
 platform: ruby
 authors:
 - nrser