ascii_binder 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d18f48c4d3a375a016de45f0e47737c1b32ab07a
-  data.tar.gz: 7b0b662b3f881776229518077135fb6c40c92459
+  metadata.gz: 878113e6748a9b16930064bfbca7294abfbd4811
+  data.tar.gz: 5dc71d9c9bb8d08ed4f27a310d3ccc2b9afef6e6
 SHA512:
-  metadata.gz: 026e842c5c884d0ff9e164c008ae7bbd87a9df5d8e7a173cf4203d9495af896c3e80a2bea3639c4cfdc8fe0c6330ab79c2db8ae9ff27b7f9910dcf2720ec4866
-  data.tar.gz: 7a729e900f87874e46dfd782599c2b42ea69b9db02a4d0a1efa82f0e7a28a180fec451e96baf26828a5fd030bb2c776dd48863e686931d887a7a837afdbff551
+  metadata.gz: bc00c724fd33063a9d3ca29b753ab8f018331aa0d03a9ed282336cc61f24c912ddd97edb68338f0e2d017c7187e1efdff79d8c31bc71e93ee3913b60b759cf9c
+  data.tar.gz: f8299dfc924f81e82f453b224c688312bea48997bd41d31d8d35ba71fb20ab864bfa3e9aff5256d393217f4fae7eb0529f70d305d1a4544201f4937dc20e312d

data/bin/asciibinder

@@ -291,8 +291,9 @@ when "build"
   call_generate(branch_group,build_distro,refresh_page)
 when "package"
   clean_up
-  call_generate(:publish,'',nil)
   package_site = cmd_opts[:site] || ''
+  branch_group = package_site == '' ? :publish : "publish_#{package_site}".to_sym
+  call_generate(branch_group,'',nil)
   package_docs(package_site)
 when "watch"
   if !dir_empty?(preview_dir)

data/lib/ascii_binder/helpers.rb

@@ -245,16 +245,20 @@ module AsciiBinder
       site_map = {}
       distro_map.each do |distro,distro_config|
         if not site_map.has_key?(distro_config["site"])
-          site_map[distro_config["site"]] = { :distros => {}, :name => distro_config['site_name'], :url => distro_config['site_url'] }
+          site_map[distro_config["site"]] = { :distros => {}, :name => distro_config['site_name'], :url => distro_config['site_url'], :branches => [] }
         end
         site_map[distro_config["site"]][:distros][distro] = distro_config["branches"]
+        distro_config["branches"].keys.each do |branch_key|
+          next if site_map[distro_config["site"]][:branches].include?(branch_key)
+          site_map[distro_config["site"]][:branches] << branch_key
+        end
       end
       site_map
     end
 
     def distro_branches(use_distro='')
       use_distro_list = use_distro == '' ? distro_map.keys : [use_distro]
-      distro_map.select{ |dkey,dval| use_distro_list.include?(dkey) }.map{ |distro,dconfig| dconfig["branches"].keys }.flatten
+      distro_map.select{ |dkey,dval| use_distro_list.include?(dkey) }.map{ |distro,dconfig| dconfig["branches"].keys }.flatten.uniq
     end
 
     def branch_group_branches
@@ -262,6 +266,9 @@ module AsciiBinder
         group_branches = Hash.new
         group_branches[:working_only] = [local_branches[0]]
         group_branches[:publish] = distro_branches
+        site_map.each do |site,site_config|
+          group_branches["publish_#{site}".to_sym] = site_config[:branches]
+        end
         group_branches[:all] = local_branches
         group_branches
       end
@@ -582,7 +589,7 @@ module AsciiBinder
             current_distro_branches = distro_branches(distro)
 
             # In publish mode we only build "valid" distro-branch combos from the distro map
-            if branch_group == :publish and not current_distro_branches.include?(local_branch)
+            if branch_group.to_s.start_with?("publish") and not current_distro_branches.include?(local_branch)
               next
             end
 

data/lib/ascii_binder/version.rb

@@ -1,3 +1,3 @@
 module AsciiBinder
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ascii_binder
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - N. Harrison Ripps
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-07 00:00:00.000000000 Z
+date: 2016-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler