hgrc_generator 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 204f9bf3a76fd803dbbb93dccd4e8485f7bd3100
-  data.tar.gz: 9c6ab88a4f6877b6c74dea60dd2c51153a313d2d
+  metadata.gz: 684a8ffcd1ac33f3715c64fb0e2157235ff28223
+  data.tar.gz: dfb3c70375cf3f5d176a92bceff8620f3eff75ea
 SHA512:
-  metadata.gz: 7ca278ea5f831bbf5acabc5946671a3bf228eb2bf0d184775b83cc2269c955da259f52631bb2ee67f580233403f4cbbf7523dcd993a7d85f4f6be25f3211cca8
-  data.tar.gz: 6bdfad757747fc639493ff91ba00a5172057608f6963e681581f5e14c5c4418ddc660f9ccf07cc648ccde81d305caa708e1f7973213fa740956f7da35acf7081
+  metadata.gz: 31410a43c198c096cc6492582da4ff5049bcef8064cced6cbb4e05a1f48f31c9bc69471fa1dee34939b05b6626f699d9703150c9b3784d1076263266ad4c5996
+  data.tar.gz: fe906df92dc40f069d28ce0e0fd705e1df3c560eaeebb994d01105b4e0981d0fd15cb84eefd1cb3aa2e4d1b09f425ca7653303842614c5d0a3926243efa63318

data/lib/hgrc_generator/alias_section.rb

@@ -49,17 +49,17 @@ module HgrcGenerator
     end
 
     def unix_local_out
-      commands = Path.get_local_out.reverse
+      commands = Path.get_local_out
       unix_format_for :llo, commands, :out
     end
 
     def unix_local_pull
-      commands = Path.get_local_in
+      commands = Path.get_local_pull
       unix_format_for :lll, commands, :pull
     end
 
     def unix_local_push
-      commands = Path.get_local_out.reverse
+      commands = Path.get_local_push
       unix_format_for :llh, commands, :push
     end
 
@@ -69,17 +69,17 @@ module HgrcGenerator
     end
 
     def unix_remote_out
-      commands = Path.get_remote_out.reverse
+      commands = Path.get_remote_out
       unix_format_for :rlo, commands, :out
     end
 
     def unix_remote_pull
-      commands = Path.get_remote_in
+      commands = Path.get_remote_pull
       unix_format_for :rll, commands, :pull
     end
 
     def unix_remote_push
-      commands = Path.get_remote_out.reverse
+      commands = Path.get_remote_push
       unix_format_for :rlh, commands, :push
     end
 

data/lib/hgrc_generator/params.rb

@@ -1,6 +1,10 @@
 module HgrcGenerator
   class Params
-    attr_reader :include_prefix, :branches, :dry_run, :help
+    attr_reader :include_prefix, :in_branches, :out_branches, :dry_run, :help
+
+    OUT_BRANCHES = [
+      :git,
+    ]
 
     HELP = <<-DOC
       hgrc_generator version #{HgrcGenerator::VERSION}
@@ -14,6 +18,10 @@ module HgrcGenerator
       BRANCH_LIST is a list of branches to push to when pushes are not forced.
       The default branch is automatically included in this list.
 
+      If git is a listed branch, it will not be used in the 'incoming' repos.
+      It will be included in the remote outgoing dev repos
+      (repos that are remote and force pushed) and pulled in from them, as well.
+
       parameters:
         --help, -h       Show this message.
         --include_prefix Include the folder one level up from the project folder
@@ -28,24 +36,40 @@ module HgrcGenerator
     end
 
     def initialize(params)
-      @branches = [:default]
+      puts '-' * 80
+      @in_branches = [:default]
+      @out_branches = []
       @include_prefix = true
 
       params.each do |param|
         if param.match(/^-/)
-          case param.downcase
-          when '--no-prefix' then @include_prefix = false
-          when '--dry-run', '-n' then @dry_run = true
-          when '--help', '-h'
-            puts HELP.gsub(/^ {6}/, '')
-            exit
-          end
+          set_switches_for param
         else
-          @branches << param
+          add_branch param
         end
       end
 
       self.class.params = self
     end
+
+    private
+
+    def set_switches_for(param)
+      case param.downcase
+      when '--no-prefix' then @include_prefix = false
+      when '--dry-run', '-n' then @dry_run = true
+      when '--help', '-h'
+        puts HELP.gsub(/^ {6}/, '')
+        exit
+      end
+    end
+
+    def add_branch(branch_name)
+      if OUT_BRANCHES.include?(branch_name.downcase.to_sym)
+        @out_branches << branch_name
+      else
+        @in_branches << branch_name
+      end
+    end
   end
 end

data/lib/hgrc_generator/path.rb

@@ -36,19 +36,35 @@ module HgrcGenerator
       end
 
       def get_local_in
-        paths.select(&:in).select(&:local)
+        paths.select(&:local?).select(&:in)
       end
 
       def get_local_out
-        paths.select(&:out).select(&:local)
+        paths.select(&:local?).select(&:out).reverse
+      end
+
+      def get_local_pull
+        paths.select(&:local?).select(&:pull)
+      end
+
+      def get_local_push
+        paths.select(&:local?).select(&:push).reverse
       end
 
       def get_remote_in
-        paths.select(&:in).reject(&:local)
+        paths.reject(&:local?).select(&:in)
       end
 
       def get_remote_out
-        paths.select(&:out).reject(&:local)
+        paths.reject(&:local?).select(&:out).reverse
+      end
+
+      def get_remote_pull
+        paths.reject(&:local?).select(&:pull)
+      end
+
+      def get_remote_push
+        paths.reject(&:local?).select(&:push).reverse
       end
     end
 
@@ -62,34 +78,46 @@ module HgrcGenerator
       :pull
 
     def initialize(key, hash)
+      @hash   = hash
       @key    = key
       @path   = path_for(hash[:path])
       @force  = hash[:force]
-      @in     = in_command if hash[:in]
+      @in     = in_command if in_command?
       @out    = out_command if hash[:out]
-      @pull   = pull_command if hash[:in]
+      @pull   = pull_command if in_command?
       @push   = push_command if hash[:out]
     end
 
-    def local
+    def local?
       !path.match(/^ssh:/)
     end
 
     private
 
+    def in_command?
+      @hash[:in] ||
+        (!params.out_branches.empty? && !local?)
+    end
+
     def in_command
-      [] << "hg in #{key}"
+      command = []
+      command << "hg in #{key}"
+      command.concat out_branches if force
+      command
     end
 
     def out_command
       command = []
       command << "hg out #{key}"
-      command.concat branches unless force
+      command.concat in_branches unless force
       command
     end
 
     def pull_command
-      [] << "hg pull #{key}"
+      command = []
+      command << "hg pull #{key}"
+      command.concat out_branches if force
+      command
     end
 
     def push_command
@@ -98,14 +126,23 @@ module HgrcGenerator
       if force
         command << '--force'
       else
-        command.concat branches
+        command.concat in_branches
         command << '--new-branch'
       end
       command
     end
 
-    def branches
-      params.branches.map do |branch|
+    def in_branches
+      branches_for :in
+    end
+
+    def out_branches
+      branches_for :out
+    end
+
+    def branches_for(direction)
+      method = "#{direction}_branches"
+      params.send(method).map do |branch|
         "--branch #{branch}"
       end
     end

data/lib/hgrc_generator/version.rb

@@ -1,3 +1,3 @@
 module HgrcGenerator
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hgrc_generator
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Travis Herrick