right_publish 0.5.1 → 0.5.2

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+### 0.5.2
+  * No longer create automatically create i386 arches for noarch packages
+
 ### 0.5.1
   * When creating apt repo on trusty, set db/version to older versions for backwards compatibility.
 

data/VERSION

@@ -1 +1 @@
-0.5.1
+0.5.2

data/lib/right_publish/repos/apt.rb

@@ -17,8 +17,8 @@ module RightPublish
     SRC_EXTENSION = 'dsc'
     BIN_ALL_ARCH = 'all'
 
-    @@supported_archs = [ 'i386', 'amd64' ]
-    @@all_archs = [ 'i386', 'amd64', BIN_ALL_ARCH ]
+    @@supported_archs = [ 'amd64' ]
+    @@all_archs = [ 'amd64', BIN_ALL_ARCH ]
 
     def add(file_or_dir, target)
       repo_updates = {}
@@ -157,7 +157,7 @@ module RightPublish
         repo_config[:dists].each { |dist| f.puts(dist_conf(dist)) }
       end
 
-      # We preseed this file with values that would be generated if this were 
+      # We preseed this file with values that would be generated if this were
       # a precise distro. If we start this repo on trusty then it'll write 5.3.x
       # for the bdb version which is not backwards compatible. The precise versions
       # are forward compatible to trusty at least though.

data/lib/right_publish/repos/yum.rb

@@ -21,7 +21,7 @@ module RightPublish
     SRC_ALL_ARCH = 'src'
     SRC_ALL_PATH = 'SRPMS'
 
-    ARCHITECTURES = [ 'i386', 'x86_64' ]
+    ARCHITECTURES = [ 'x86_64' ]
     PKG_TYPES = [ ARCHITECTURES, BIN_ALL_ARCH, SRC_ALL_ARCH ]
 
     def add(file_or_dir, target)
@@ -124,7 +124,7 @@ module RightPublish
         end
         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

data/right_publish.gemspec

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

data/spec/repos/apt_spec.rb

@@ -160,13 +160,13 @@ describe RightPublish::AptRepo do
             @repo.publish(deb_files, @target_distribution_str)
           end
 
-          it "installs a directory mixed of amd64 and i386 debs to a dist" do
-            deb_files = ['foo_1_amd64.deb', 'bar_1_i386.deb']
-            build_expectations(deb_files,@target_distribution_str)
-            flexmock(File) { |obj| obj.should_receive(:directory?).and_return(true) }
-            flexmock(Dir) { |obj| obj.should_receive(:glob).and_return(deb_files) }
-            @repo.publish('some_dir/', @target_distribution_str)
-          end
+          # it "installs a directory mixed of amd64 and i386 debs to a dist" do
+          #   deb_files = ['foo_1_amd64.deb', 'bar_1_i386.deb']
+          #   build_expectations(deb_files,@target_distribution_str)
+          #   flexmock(File) { |obj| obj.should_receive(:directory?).and_return(true) }
+          #   flexmock(Dir) { |obj| obj.should_receive(:glob).and_return(deb_files) }
+          #   @repo.publish('some_dir/', @target_distribution_str)
+          # end
 
           it "fails with no files in a dir" do
             flexmock(File) { |obj| obj.should_receive(:directory?).and_return(true) }
@@ -182,7 +182,7 @@ describe RightPublish::AptRepo do
           end
 
           it "fails with unknown architectures" do
-            deb_files = ['foo.ppc.deb', 'bar.ppc.deb']
+            deb_files = ['foo.ppc.deb', 'bar.i386.deb']
             @repo.should_receive(@system_func).never
             expect { @repo.publish(deb_files, @target_distribution_str) }.to raise_error(RuntimeError)
           end

data/spec/repos/yum_spec.rb

@@ -164,14 +164,6 @@ describe RightPublish::YumRepo do
             @repo.publish(rpm_files, @target_distribution_str)
           end
 
-          it "installs a directory mixed of x86_64 and i386 rpms to a dist" do
-            rpm_files = ['foo-1.x86_64.rpm', 'bar-2.i386.rpm']
-            build_expectations(rpm_files,@target_distribution_map)
-            flexmock(File) { |obj| obj.should_receive(:directory?).and_return(true) }
-            flexmock(Dir) { |obj| obj.should_receive(:glob).and_return(rpm_files) }
-            @repo.publish('some_dir/', @target_distribution_str)
-          end
-
           it "fails with no files in a dir" do
             flexmock(File) { |obj| obj.should_receive(:directory?).and_return(true) }
             flexmock(Dir) { |obj| obj.should_receive(:glob).and_return([]) }
@@ -186,7 +178,7 @@ describe RightPublish::YumRepo do
           end
 
           it "fails with unknown architectures" do
-            rpm_files = ['foo-1.ppc.rpm', 'bar-2.ppc.rpm']
+            rpm_files = ['foo-1.ppc.rpm', 'bar-2.i386.rpm']
             @repo.should_receive(:system).never
             expect { @repo.publish(rpm_files, @target_distribution_str) }.to raise_error(RuntimeError)
           end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: right_publish
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-20 00:00:00.000000000 Z
+date: 2014-08-06 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: -3081440697787763880
+      hash: 4173873965182779825
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: