right_publish 0.5.2 → 0.6.0

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+### 0.6.0
+  * Include .dsc and .tar.gz in index for ubuntu
+  * Change up el/6 format to be consistent with ubuntu format
+
 ### 0.5.2
   * No longer create automatically create i386 arches for noarch packages
 

data/README.rdoc

@@ -43,7 +43,7 @@ debian distros. It expects the "expect" package to be installed on all distros.
   gem_repo:
     subdir:                      # -: gems/
   yum_repo:
-    dists:                       # *: el: ['6']
+    dists:                       # *: [ el/6 ]
     epel:                        # -: 1
     subdir:                      # -: yum/
     gpg_key_id:                  # *: 9A917D05

data/VERSION

@@ -1 +1 @@
-0.5.2
+0.6.0

data/lib/right_publish/repos/apt.rb

@@ -55,7 +55,7 @@ module RightPublish
 
     def annotate(options={})
       options[:subdir] ||= File.join(repo_config[:subdir], 'pool', 'main')
-      options[:filter] = ['*.deb']
+      options[:filter] = ['*.deb', '*.dsc', '*.tar.gz']
       super(options)
     end
 

data/lib/right_publish/repos/yum.rb

@@ -115,9 +115,7 @@ module RightPublish
 
       if target
         #TODO Check that the specified dist is configured in the profile (sanity)
-        dist, dist_ver = target.split("/")
-        fail("dist format needs to be in form 'dist/dist_version'!") unless dist && dist_ver
-        dists = {dist => [dist_ver]}
+        dists = [target]
       else
         unless [BIN_ALL_ARCH,SRC_ALL_ARCH].include? pkg_arch
           fail("need to specify a distribution with binary packages!")
@@ -125,18 +123,18 @@ module RightPublish
         dists = repo_config[:dists]
       end
 
-      dists.each_pair do |dist,dist_vers|
-        dist_vers.each do |ver|
-          # Source RPMS stored in SRPMS architecture, noarchs go to all architectures
-          case pkg_arch
-          when SRC_ALL_ARCH
-            [SRC_ALL_PATH]
-          when BIN_ALL_ARCH
-            ARCHITECTURES
-          else
-            [pkg_arch]
-          end.each { |arch| yield repo_dir(repo_config[:epel].to_s, dist.to_s, ver.to_s, arch) }
-        end
+      dists.each do |dist|
+        dist_name, dist_ver = dist.split("/")
+        fail("dist #{dist} format needs to be in form 'dist/dist_version'!") unless dist_name && dist_ver =~ /^\d+$/
+        # Source RPMS stored in SRPMS architecture, noarchs go to all architectures
+        case pkg_arch
+        when SRC_ALL_ARCH
+          [SRC_ALL_PATH]
+        when BIN_ALL_ARCH
+          ARCHITECTURES
+        else
+          [pkg_arch]
+        end.each { |arch| yield repo_dir(repo_config[:epel].to_s, dist_name.to_s, dist_ver.to_s, arch) }
       end
     end
 

data/right_publish.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "right_publish"
-  s.version = "0.5.2"
+  s.version = "0.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brian Szmyd", "Tony Spataro"]

data/spec/repos/yum_spec.rb

@@ -52,13 +52,13 @@ describe RightPublish::YumRepo do
                            [pkg_arch]
                          end
 
-            expected_dists.each_pair do |dist,releases|
-              releases.each do |release|
-                dest_archs.each do |arch|
-                  dist_path = File.join(@repo_subdir, @epel_version.to_s, dist.to_s, release, arch)
-                  @install_expectations[dist_path] ||= []
-                  @install_expectations[dist_path] << pkg
-                end
+            expected_dists.each do |dist|
+              dist_name, release = dist.split("/")
+
+              dest_archs.each do |arch|
+                dist_path = File.join(@repo_subdir, @epel_version.to_s, dist_name.to_s, release.to_s, arch)
+                @install_expectations[dist_path] ||= []
+                @install_expectations[dist_path] << pkg
               end
             end
           end
@@ -75,7 +75,7 @@ describe RightPublish::YumRepo do
         end
 
         before(:each) do
-          @epel_dists = {:el=>['5','6'],:fc=>['12','13']}
+          @epel_dists = ["el/5", "el/6", "fc/12", "fc/13"]
           @epel_version = 1
           @install_expectations = {}
           @profile = flexmock(RightPublish::Profile) do |obj|
@@ -148,7 +148,7 @@ describe RightPublish::YumRepo do
 
         context "Architecture Dependant Packages" do
           before(:each) do
-            @target_distribution_map = {:fc=>['12']}
+            @target_distribution_map = [ 'fc/12' ]
             @target_distribution_str = 'fc/12'
           end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: right_publish
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-06 00:00:00.000000000 Z
+date: 2014-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -279,7 +279,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4173873965182779825
+      hash: 4208402658745595794
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: