Allow noarch to slip through

nicinabox · Feb 2, 2014 · 12c49e5 · 12c49e5
1 parent 08e61af
commit 12c49e5
Show file tree

Hide file tree

Showing 4 changed files with 114 additions and 4 deletions.
diff --git a/lib/trolley/package.rb b/lib/trolley/package.rb
@@ -45,9 +45,8 @@ def matched_version
     end
 
     def from_os?(version=nil)
-      if @target_version_string
-        # If target version, use version's slackaware
-        !!version['slackware']
+      if version['arch'] == 'noarch' or @target_version_string
+        true
 
       else
         # If no target version, use current slackware

diff --git a/spec/cli_spec.rb b/spec/cli_spec.rb
@@ -3,6 +3,7 @@
 describe Trolley::CLI do
   let!(:openssl_json) { JSON.parse(File.read('spec/support/openssl.json')) }
   let!(:kernel_headers_json) { JSON.parse(File.read('spec/support/kernel-headers.json')) }
+  let!(:ca_certs_json) { JSON.parse(File.read('spec/support/ca-certificates.json')) }
 
   before do
     FakeFS.activate!
@@ -111,6 +112,14 @@
         => Installed
       out
 
+      allow(Trolley::CLI).to receive(:get).and_return(ca_certs_json)
+      output1 = capture(:stdout) { Trolley::CLI.start(['install', 'ca-certificates']) }
+      output1.should == <<-out.outdent
+        => Downloading ca-certificates (20130906 noarch)
+        => Installing
+        => Installed
+      out
+
       File.exists?("/boot/extra/openssl-0.9.8y-i486-1_slack13.1.txz").should be_true
     end
 

diff --git a/spec/package_spec.rb b/spec/package_spec.rb
@@ -7,7 +7,6 @@
   let(:receiver) { double("receiver") }
 
   before(:each) do
-    # Trolley::Package.any_instance.stub(x64?: false)
     Trolley::Package.any_instance.stub(arch: 'i686')
     Trolley::Package.any_instance.stub(slackware: '13.1')
   end

diff --git a/spec/support/ca-certificates.json b/spec/support/ca-certificates.json
@@ -0,0 +1,103 @@
+{
+   "versions" : [
+      {
+         "x64" : false,
+         "arch" : "noarch",
+         "version" : "20090814",
+         "path" : "/slackware/slackware-13.37/slackware/n/ca-certificates-20090814-noarch-1.txz",
+         "package_name" : "ca-certificates-20090814-noarch-1.txz",
+         "description" : "ca-certificates (PEM Files of CA Certificates)\n\nThis package includes PEM files of CA certificates to allow SSL-based applications to check for the authenticity of SSL connections.\n\nHomepage: http://packages.qa.debian.org/c/ca-certificates.html",
+         "size_compressed" : 118784,
+         "build" : "noarch",
+         "size_uncompressed" : 368640,
+         "slackware" : "13.37",
+         "file_name" : "ca-certificates-20090814-noarch-1",
+         "summary" : "ca-certificates (PEM Files of CA Certificates)",
+         "id" : 1149,
+         "patch" : false
+      },
+      {
+         "x64" : false,
+         "arch" : "noarch",
+         "version" : "20120623",
+         "path" : "/slackware/slackware-14.0/slackware/n/ca-certificates-20120623-noarch-2.txz",
+         "package_name" : "ca-certificates-20120623-noarch-2.txz",
+         "description" : "ca-certificates (PEM Files of CA Certificates)\n\nThis package includes PEM files of CA certificates to allow SSL-based applications to check for the authenticity of SSL connections.\n\nHomepage: http://packages.qa.debian.org/c/ca-certificates.html",
+         "size_compressed" : 135168,
+         "build" : "noarch",
+         "size_uncompressed" : 389120,
+         "slackware" : "14.0",
+         "file_name" : "ca-certificates-20120623-noarch-2",
+         "summary" : "ca-certificates (PEM Files of CA Certificates)",
+         "id" : 2249,
+         "patch" : false
+      },
+      {
+         "x64" : false,
+         "arch" : "noarch",
+         "version" : "20130906",
+         "path" : "/slackware/slackware-13.37/patches/packages/ca-certificates-20130906-noarch-1_slack13.37.txz",
+         "package_name" : "ca-certificates-20130906-noarch-1_slack13.37.txz",
+         "description" : "ca-certificates (PEM Files of CA Certificates)\n\nThis package includes PEM files of CA certificates to allow SSL-based applications to check for the authenticity of SSL connections.\n\nHomepage: http://packages.qa.debian.org/c/ca-certificates.html",
+         "size_compressed" : 151552,
+         "build" : "noarch",
+         "size_uncompressed" : 430080,
+         "slackware" : "13.37",
+         "file_name" : "ca-certificates-20130906-noarch-1_slack13.37",
+         "summary" : "ca-certificates (PEM Files of CA Certificates)",
+         "id" : 2105,
+         "patch" : true
+      },
+      {
+         "x64" : false,
+         "arch" : "noarch",
+         "version" : "20130906",
+         "path" : "/slackware/slackware-14.0/patches/packages/ca-certificates-20130906-noarch-1_slack14.0.txz",
+         "package_name" : "ca-certificates-20130906-noarch-1_slack14.0.txz",
+         "description" : "ca-certificates (PEM Files of CA Certificates)\n\nThis package includes PEM files of CA certificates to allow SSL-based applications to check for the authenticity of SSL connections.\n\nHomepage: http://packages.qa.debian.org/c/ca-certificates.html",
+         "size_compressed" : 151552,
+         "build" : "noarch",
+         "size_uncompressed" : 430080,
+         "slackware" : "14.0",
+         "file_name" : "ca-certificates-20130906-noarch-1_slack14.0",
+         "summary" : "ca-certificates (PEM Files of CA Certificates)",
+         "id" : 3327,
+         "patch" : true
+      },
+      {
+         "x64" : false,
+         "arch" : "noarch",
+         "version" : "20130906",
+         "path" : "/slackware/slackware-14.1/slackware/n/ca-certificates-20130906-noarch-1.txz",
+         "package_name" : "ca-certificates-20130906-noarch-1.txz",
+         "description" : "ca-certificates (PEM Files of CA Certificates)\n\nThis package includes PEM files of CA certificates to allow SSL-based applications to check for the authenticity of SSL connections.\n\nHomepage: http://packages.qa.debian.org/c/ca-certificates.html",
+         "size_compressed" : 151552,
+         "build" : "1",
+         "size_uncompressed" : 430080,
+         "slackware" : "14.1",
+         "file_name" : "ca-certificates-20130906-noarch-1",
+         "summary" : "ca-certificates (PEM Files of CA Certificates)",
+         "id" : 4731,
+         "patch" : false
+      },
+      {
+         "x64" : true,
+         "arch" : "noarch",
+         "version" : "20130906",
+         "path" : "/slackware/slackware64-14.1/slackware64/n/ca-certificates-20130906-noarch-1.txz",
+         "package_name" : "ca-certificates-20130906-noarch-1.txz",
+         "description" : "ca-certificates (PEM Files of CA Certificates)\n\nThis package includes PEM files of CA certificates to allow SSL-based applications to check for the authenticity of SSL connections.\n\nHomepage: http://packages.qa.debian.org/c/ca-certificates.html",
+         "size_compressed" : 151552,
+         "build" : "1",
+         "size_uncompressed" : 430080,
+         "slackware" : "14.1",
+         "file_name" : "ca-certificates-20130906-noarch-1",
+         "summary" : "ca-certificates (PEM Files of CA Certificates)",
+         "id" : 5996,
+         "patch" : false
+      }
+   ],
+   "slug" : "ca-certificates",
+   "name" : "ca-certificates",
+   "id" : 1016
+}