suppository 0.0.3 → 0.0.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MGVlYmFkYTM5ODQwNGI1MDJlODA5YWQwMWMwYmNjOTNiY2I5ZjdlNg==
+    MzUzYWU5N2UzZWUyMTQ5MjNhYzBlMWVmNzY3MzkwZjU2YTcyYjM4YQ==
   data.tar.gz: !binary |-
-    M2FjZjA0ODRlNDczYTZjOWIwOWIwNDgzMjU1MmEyYTE4NmI1ODc2YQ==
+    ZWI3ZGNhN2VmYWY5NTU2ZmI1ZDYyYTczZDE3OTdhZjk5NzY0MjQ1MA==
 SHA512:
   metadata.gz: !binary |-
-    Y2Q5NTlkYTBiNWU3NDJjMWQyNjYxNWU1NjhjZDBmODNhYzgzMTk2OTAzMTc2
-    NWVjYmI3MzRhMzY5NGExYWY5MDlhZTU5OTc4Yjc1MjQ3MTVjOTEzODk5NjMx
-    ZDUxMmUzYmIyMzkxYzFkZjM1MGI1ODg2NzIyMTJmNjk2MTY4Yjg=
+    MjUxYmNmOTVjN2U1NzhhNmI3N2M3OWFhNzJhZTM2YjdkYzY1OGM4ODZmMWEy
+    YjRjNTQ4YTA5ZGM0NDUyYWI2ZWYwMDUyZWY5NGQ0YzQ0MGE1NzVjNGY5OGNk
+    NTQ0MjMyYzdlZTZjMjViODYyYjk0ZDBkYjA0ZGZlYWRjYTNlM2E=
   data.tar.gz: !binary |-
-    NGFlZGYwYTU4NWQzZWYwOGIxM2E5Y2ZjNzliMzkwMDkyNjIyZjk2YjJmYmE4
-    NjA4N2FkYzYyZjgzNmFkODg5ZDU0MzM3NzEzZGEzMTBmNzgwMjU1MDkzOTVh
-    MThhM2MzYzIyM2I0NmVkYzhiN2IyYjI5MTNlNWRjNTFjMTExODY=
+    MDEyOTY0NTU2MTk2YjMwZjllZWQyMDhkNWQ1Y2M1YmJhOGViM2QyZjQ4ODY3
+    ZjJhMGFhOThjYjMzNTRiYzNkNWQ1M2E1YjcyNDdlNGZlMGRjM2UwZTVlNzUz
+    MzQ2YzkzZGMzM2IyMDY2OTA1Nzk4OWNhNDEzYTFhZTI0ZmRjMWM=

data/Guardfile

@@ -23,8 +23,8 @@
 #
 # and, you'll have to watch "config/Guardfile" instead of "Guardfile"
 
-guard :rspec , cmd: 'bundle exec rspec' do
+guard :rspec, cmd: 'bundle exec rspec' do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
-  watch('spec/spec_helper.rb')  { "spec" }
+  watch('spec/spec_helper.rb')  { 'spec' }
 end

data/README.md

@@ -71,7 +71,7 @@ This will run all the tests and then create a gem file. NOTE: Only files tracked
 
 Check everything build and the tests pass
 
-    $ bundle exec build
+    $ bundle exec rake build
 
 Create release using GitFlow (http://danielkummer.github.io/git-flow-cheatsheet/)
 

data/Rakefile

@@ -4,11 +4,11 @@ require 'rspec/core/rake_task'
 require 'rubocop/rake_task'
 require 'suppository/version'
 
-desc "Run Code quality checks and tests "
-task :default => [:clean,:rubocop,:test]
+desc 'Run Code quality checks and tests '
+task default: [:clean, :rubocop, :test]
 
-desc "Run Code quality checks, tests and then create Gem File"
-task :build => [:clean,:rubocop,:test,:gem]
+desc 'Run Code quality checks, tests and then create Gem File'
+task build: [:clean, :rubocop, :test, :gem]
 
 CLEAN.include("suppository-#{Suppository::VERSION}.gem")
 CLEAN.include('coverage')
@@ -18,8 +18,8 @@ task :test do
     t.pattern = 'spec/**/*_spec.rb'
     t.verbose = false
   end
-  
-  Rake::Task["spec"].execute
+
+  Rake::Task['spec'].execute
 end
 
 task :rubocop do
@@ -30,5 +30,5 @@ task :rubocop do
 end
 
 task :gem do
-  system "gem build suppository.gemspec"
+  system 'gem build suppository.gemspec'
 end

data/bin/suppository

@@ -5,16 +5,16 @@ require_relative '../lib/suppository/cli'
 require_relative '../lib/suppository/logger'
 require_relative '../lib/suppository/help'
 
-std_trap = trap("INT") { exit! 130 } # no backtrace thanks
+std_trap = trap('INT') { exit! 130 } # no backtrace thanks
 
 begin
-  trap("INT", std_trap) # restore default CTRL-C handler
+  trap('INT', std_trap) # restore default CTRL-C handler
   Suppository::CLI.run(ARGV)
 rescue UsageError
-  Suppository::Logger.log_error "Invalid usage"
+  Suppository::Logger.log_error 'Invalid usage'
   abort Suppository.help
 rescue SystemExit
-  puts "Kernel.exit" if ARGV.verbose?
+  puts 'Kernel.exit' if ARGV.verbose?
   raise
 rescue Interrupt => e
   puts # seemingly a newline is typical
@@ -30,7 +30,3 @@ rescue Exception => e
   puts e.backtrace
   exit 1
 end
-
-
-
-

data/lib/suppository/add_command.rb

@@ -72,18 +72,27 @@ module Suppository
     def create_dist_file(master_file, deb)
       @repository.archs.each do |arch|
         FileUtils.ln_s master_file, dist_file(arch, deb), force: true
-        update_packages master_file, arch
+        update_packages arch
       end
     end
 
-    def update_packages(master_file, arch)
-      deb = Suppository::MasterDeb.new(master_file)
+    def update_packages(arch)
       file = package_file(arch)
-      package_info = Suppository::Package.new(internal_path(arch), deb).content
-      open(file, 'a') { |f| f.puts package_info }
+      FileUtils.rm(file)
+      FileUtils.rm("#{file}.gz")
+      Dir.glob("#{component_path}/binary-#{arch}/*deb").each do |deb_link|
+        update_package(deb_link, arch)
+      end
       Suppository::Gzip.compress file
     end
 
+    def update_package(deb_link, arch)
+      master_file = File.symlink?(deb_link) ? File.readlink(deb_link) : deb_link
+      deb = Suppository::MasterDeb.new(master_file)
+      package_info = Suppository::Package.new(internal_path(arch), deb).content
+      open(package_file(arch), 'a') { |f| f.puts package_info }
+    end
+
     def dist_file(arch, deb)
       filename = Suppository::MasterDeb.new(suppository_file(deb)).filename
       "#{component_path}/binary-#{arch}/#{filename}"

data/lib/suppository/release.rb

@@ -68,7 +68,7 @@ module Suppository
     end
 
     def packages
-      @packages ||= Dir.glob("#{@dist_path}/*/*/Packages*")
+      @packages ||= Dir.glob("#{@dist_path}/*/*/Packages*").sort
     end
 
     def puts_hash(f, hash)
@@ -85,7 +85,7 @@ module Suppository
     end
 
     def architectures
-      directories("#{@dist_path}/*/*").collect { |d| d.split('-')[1] }.uniq.join(' ')
+      directories("#{@dist_path}/*/*").collect { |d| d.split('-')[1] }.uniq.sort.join(' ')
     end
 
     def directories(path_pattern)

data/lib/suppository/repository.rb

@@ -4,8 +4,8 @@ module Suppository
 
     def initialize(path)
       @path = File.expand_path(path)
-      @dists = %w(natty lucid precise saucy trusty)
-      @archs = %w(amd64 i386)
+      @dists = %w(natty lucid precise saucy trusty).sort
+      @archs = %w(amd64 i386).sort
       @suppository = "#{@path}/.suppository"
     end
 

data/lib/suppository/version.rb

@@ -1,3 +1,3 @@
 module Suppository
-  VERSION = '0.0.3'
+  VERSION = '0.0.6'
 end

data/spec/spec_helper.rb

@@ -3,19 +3,18 @@ require 'fakefs/spec_helpers'
 require 'rspec/mocks/standalone'
 require 'stringio'
 require 'simplecov'
-require "codeclimate-test-reporter"
+require 'codeclimate-test-reporter'
 CodeClimate::TestReporter.start
 
 SimpleCov.start do
   SimpleCov.minimum_coverage 100
-  SimpleCov.add_filter "/spec/"
+  SimpleCov.add_filter '/spec/'
 end
 
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
-RSpec.configure do |config| 
-  
+RSpec.configure do |config|
   config.before do
     $stdout = StringIO.new
   end
@@ -23,8 +22,8 @@ RSpec.configure do |config|
   config.after(:all) do
     $stdout = STDOUT
   end
-   
-  config.filter_run :focus => true
+
+  config.filter_run focus: true
   config.run_all_when_everything_filtered = true
   config.color = true
   config.mock_with :rspec
@@ -32,24 +31,20 @@ RSpec.configure do |config|
   config.raise_errors_for_deprecations!
 end
 
- 
-def get_exception 
-  e_message = ""
-  begin      
+def get_exception
+  e_message = ''
+  begin
     yield
   rescue => e
     e_message = e.message
-  end 
+  end
   e_message
 end
 
 def deb_file
-  File.expand_path(File.dirname(__FILE__)+"../../fixtures/curl_7.22.0-3ubuntu4.11_amd64.deb")
+  File.expand_path(File.dirname(__FILE__) + '../../fixtures/curl_7.22.0-3ubuntu4.11_amd64.deb')
 end
 
 def deb_file_glob
-  File.expand_path(File.dirname(__FILE__)+"../../fixtures/*.deb")
+  File.expand_path(File.dirname(__FILE__) + '../../fixtures/*.deb')
 end
-
-
-

data/spec/suppository/add_command_spec.rb

@@ -7,9 +7,8 @@ require 'suppository/create_command'
 require 'suppository/exceptions'
 
 describe Suppository::AddCommand do
-    
   before(:each) do
-    repository_path = "/tmp/supposotory_test_#{Time.now.to_f}"
+    repository_path = "/tmp/suppository_test_#{Time.now.to_f}"
     @file_name = 'e5ca0a9797acda4bfe8404524f0976b3_b37ce9b17405d93c323c0b8bbe167c6f2dccfe02_5a315c56bc34f1ffed365f9aa50bbb36916e5a8fae8614f00d952983d4316555.deb'
     @second_file = '2f860ed12d2ad99bacc78d95fb9e7989_323ee30c17a0ca4bbb2b95032fc79f84f4ca26f2_66bce137768403d517468a1f70bd98644558cd000f250dd8cc2faeedda5d4b2f.deb'
     @repository = Suppository::Repository.new(repository_path)
@@ -32,26 +31,26 @@ describe Suppository::AddCommand do
     expect(File.file?("#{@repository.suppository}/#{@file_name}")).to be_truthy
   end
 
-  describe "expects release to work -" do
+  describe 'expects release to work -' do
     before(:each) do
       release = double(Suppository::Release)
       expect(release).to receive(:create)
       expect(Suppository::Release).to receive(:new).with(@repository.path, @dist, false) { release }
     end
 
-    it "add suppository file" do  
+    it 'add suppository file' do
       @adder.run
       expect(File.file?("#{@repository.suppository}/#{@file_name}")).to be_truthy
     end
 
-    it "supports globs for deb file" do  
+    it 'supports globs for deb file' do
       @adder = Suppository::AddCommand.new([@repository.path, @dist, @component, deb_file_glob])
       @adder.run
       expect(File.file?("#{@repository.suppository}/#{@file_name}")).to be_truthy
       expect(File.file?("#{@repository.suppository}/#{@second_file}")).to be_truthy
     end
 
-    it "adds package to dists" do  
+    it 'adds package to dists' do
       @adder.run
       @repository.dists.each do |dist|
         @repository.archs.each do |arch|
@@ -64,8 +63,7 @@ describe Suppository::AddCommand do
       end
     end
 
-
-    it "updates Packages file" do  
+    it 'updates Packages file' do
       supository_file = "#{@repository.suppository}/#{@file_name}"
       @adder.run
       @repository.archs.each do |arch|
@@ -78,7 +76,7 @@ describe Suppository::AddCommand do
       end
     end
 
-    it "updates Packages.gz file" do  
+    it 'updates Packages.gz file' do
       supository_file = "#{@repository.suppository}/#{@file_name}"
       @adder.run
       @repository.archs.each do |arch|
@@ -86,56 +84,54 @@ describe Suppository::AddCommand do
         path = "#{@repository.path}/#{internal_path}"
         packages_path = "#{path}/Packages.gz"
         deb = Suppository::MasterDeb.new(supository_file)
-        content = Suppository::Package.new(internal_path,deb).content
-        result =""
-        Zlib::GzipReader.open(packages_path) {|gz|
+        content = Suppository::Package.new(internal_path, deb).content
+        result = ''
+        Zlib::GzipReader.open(packages_path) do|gz|
           result << gz.read
-        }
+        end
 
         expect(result).to match content
       end
     end
   end
-  
-  it "cant add package to new dists" do  
-    adder = Suppository::AddCommand.new([@repository.path, 'new_dist', @component, deb_file]) 
-    expect { 
-     adder.run
-    }.to raise_error(InvalidDistribution)
+
+  it 'cant add package to new dists' do
+    adder = Suppository::AddCommand.new([@repository.path, 'new_dist', @component, deb_file])
+    expect do
+      adder.run
+    end.to raise_error(InvalidDistribution)
   end
-  
-  it "cant add package to new component" do  
+
+  it 'cant add package to new component' do
     adder = Suppository::AddCommand.new([@repository.path, @dist, 'testing', deb_file])
-    expect { 
+    expect do
       adder.run
-    }.to raise_error(InvalidComponent)
+    end.to raise_error(InvalidComponent)
   end
-  
-  it "cant add package to non existant repository" do 
+
+  it 'cant add package to non existant repository' do
     adder = Suppository::AddCommand.new(['boom', @dist, 'testing', deb_file])
-  
-    expect { 
+
+    expect do
       adder.run
-     }.to raise_error(InvalidRepositoryError)
+    end.to raise_error(InvalidRepositoryError)
   end
-  
-  it "needs non nil arguments" do  
-    expect { 
+
+  it 'needs non nil arguments' do
+    expect do
       Suppository::AddCommand.new(nil)
-    }.to raise_error(UsageError)
+    end.to raise_error(UsageError)
   end
-  
-  it "needs arguments" do  
-    expect { 
+
+  it 'needs arguments' do
+    expect do
       Suppository::AddCommand.new([])
-    }.to raise_error(UsageError)
+    end.to raise_error(UsageError)
   end
 
-  it "needs four arguments" do  
-    expect { 
+  it 'needs four arguments' do
+    expect do
       Suppository::AddCommand.new([@repository.path, @dist, 'testing'])
-    }.to raise_error(UsageError)
+    end.to raise_error(UsageError)
   end
-
 end
-

data/spec/suppository/cli_spec.rb

@@ -7,44 +7,41 @@ require 'suppository/create_command'
 require 'suppository/add_command'
 
 describe Suppository::CLI do
-  
   before(:each) do
     @path = '/tmp/repo123'
     @repository = double(Suppository::Repository)
   end
-  
-  it "shows current version" do    
+
+  it 'shows current version' do
     command = double(Suppository::VersionCommand)
-    expect(Suppository::VersionCommand).to receive(:new).with([]) {command}
+    expect(Suppository::VersionCommand).to receive(:new).with([]) { command }
     expect(command).to receive(:run)
     Suppository::CLI.run(['version'])
   end
-  
-  it "can create new repository" do    
+
+  it 'can create new repository' do
     creator = double(Suppository::CreateCommand)
-    expect(Suppository::CreateCommand).to receive(:new).with([@path]) {creator}
+    expect(Suppository::CreateCommand).to receive(:new).with([@path]) { creator }
     expect(creator).to receive(:run)
     Suppository::CLI.run(['create', @path])
   end
-  
-  it "can add deb repository" do  
+
+  it 'can add deb repository' do
     adder = double(Suppository::AddCommand)
-    expect(Suppository::AddCommand).to receive(:new).with([@path, 'trusty', '/tmp/example.deb']) {adder}
-    expect(adder).to receive(:run)   
-    Suppository::CLI.run(['add', @path , 'trusty', '/tmp/example.deb'])
+    expect(Suppository::AddCommand).to receive(:new).with([@path, 'trusty', '/tmp/example.deb']) { adder }
+    expect(adder).to receive(:run)
+    Suppository::CLI.run(['add', @path, 'trusty', '/tmp/example.deb'])
   end
-  
-  it "rase usage error for empty args" do
-    expect { 
+
+  it 'rase usage error for empty args' do
+    expect do
       Suppository::CLI.run([])
-    }.to raise_error(UsageError)
+    end.to raise_error(UsageError)
   end
-  
-  it "rase usage error for invalid command" do
-    expect { 
+
+  it 'rase usage error for invalid command' do
+    expect do
       Suppository::CLI.run(['bla'])
-    }.to raise_error(UsageError)
+    end.to raise_error(UsageError)
   end
 end
-  
-  

data/spec/suppository/command_runner_spec.rb

@@ -4,23 +4,18 @@ require 'suppository/command_runner'
 require 'suppository/exceptions'
 
 describe Suppository::CommandRunner do
-  
-  it "run command" do    
+  it 'run command' do
     runner = Suppository::CommandRunner.new('echo', '1234')
     expect(runner.run).to eql("1234\n")
   end
-  
-  it "command not found" do    
+
+  it 'command not found' do
     runner = Suppository::CommandRunner.new('notavalidcommand')
     expect { runner.run }.to raise_error(CommandMissingError)
   end
-  
-  it "command error" do    
+
+  it 'command error' do
     runner = Suppository::CommandRunner.new('man', '--invalidoption')
     expect { runner.run }.to raise_error(CommandError)
   end
-  
-  
 end
-  
-  

data/spec/suppository/create_command_spec.rb

@@ -4,33 +4,31 @@ require 'suppository/create_command'
 require 'suppository/repository'
 
 describe Suppository::CreateCommand do
-
   before(:each) do
     repository_path = "/tmp/suppository_test_#{Time.now.to_f}"
     @repository = Suppository::Repository.new(repository_path)
     @creator = Suppository::CreateCommand.new([@repository.path])
   end
-  
+
   after(:each) do
-    FileUtils.rm_r(@repository.path) if File.directory?(@repository.path) 
+    FileUtils.rm_r(@repository.path) if File.directory?(@repository.path)
   end
 
-  it "can create new repository" do
-    expect{@creator.run}.to output("==> Created new Repository - #{@repository.path}\n").to_stdout 
+  it 'can create new repository' do
+    expect { @creator.run }.to output("==> Created new Repository - #{@repository.path}\n").to_stdout
   end
 
-
-  it "creates repository root folder" do
+  it 'creates repository root folder' do
     @creator.run
     expect(File.directory?(@repository.path)).to be_truthy
   end
 
-  it "creates a .supository file" do
+  it 'creates a .supository file' do
     @creator.run
     expect(File.directory?("#{@repository.path}/.suppository")).to be_truthy
   end
-  
-  it "creates a Packages file" do
+
+  it 'creates a Packages file' do
     @creator.run
     @repository.dists.each do |dist|
       @repository.archs.each do |arch|
@@ -38,24 +36,23 @@ describe Suppository::CreateCommand do
       end
     end
   end
-  
-  it "creates a Packages.gz file" do
+
+  it 'creates a Packages.gz file' do
     @creator.run
     @repository.dists.each do |dist|
       @repository.archs.each do |arch|
-        file_name = "#{@repository.path}/dists/#{dist}/internal/binary-#{arch}/Packages.gz"     
+        file_name = "#{@repository.path}/dists/#{dist}/internal/binary-#{arch}/Packages.gz"
         expect(Zlib::GzipReader.open(file_name)).to be_truthy
       end
     end
   end
 
-
-  it "aborts if file suppository already exists" do
+  it 'aborts if file suppository already exists' do
     FileUtils.mkdir_p @repository.suppository
-    expect(get_exception{@creator.run}).to eql "#{@repository.path} is already a repository"
+    expect(get_exception { @creator.run }).to eql "#{@repository.path} is already a repository"
   end
 
-  it "creates folder structure" do
+  it 'creates folder structure' do
     @creator.run
     @repository.dists.each do |dist|
       @repository.archs.each do |arch|
@@ -63,18 +60,16 @@ describe Suppository::CreateCommand do
       end
     end
   end
-  
-  it "needs non nil arguments" do  
-    expect { 
+
+  it 'needs non nil arguments' do
+    expect do
       Suppository::CreateCommand.new(nil)
-    }.to raise_error(UsageError)
+    end.to raise_error(UsageError)
   end
-  
-  it "needs arguments" do  
-    expect { 
+
+  it 'needs arguments' do
+    expect do
       Suppository::CreateCommand.new([])
-    }.to raise_error(UsageError)
+    end.to raise_error(UsageError)
   end
-
 end
-

data/spec/suppository/dpkg_deb_line_spec.rb

@@ -3,34 +3,31 @@ require 'spec_helper'
 require 'suppository/dpkg_deb_line'
 
 describe Suppository::DpkgDebLine do
-      
-  it "field" do
+  it 'field' do
     line = 'Depends: libc6 (>= 2.14), libcurl3 (>= 7.16.2-1), zlib1g (>= 1:1.1.4)'
     values = Suppository::DpkgDebLine.new(line).attributes
     expect(values['Depends']).to eql 'libc6 (>= 2.14), libcurl3 (>= 7.16.2-1), zlib1g (>= 1:1.1.4)'
   end
-  
-  it "description first line" do
+
+  it 'description first line' do
     line = 'Description: Get a file from an HTTP, HTTPS or FTP server'
     values = Suppository::DpkgDebLine.new(line).attributes
     expect(values['Description']).to eql 'Get a file from an HTTP, HTTPS or FTP server'
   end
-  
-  it "description other line" do
+
+  it 'description other line' do
     line = ' curl is a client to get files from servers using any of the supported'
     values = Suppository::DpkgDebLine.new(line).attributes
     expect(values['Description']).to eql ' curl is a client to get files from servers using any of the supported'
   end
-  
-  it "dot" do
+
+  it 'dot' do
     line = ' .'
     values = Suppository::DpkgDebLine.new(line).attributes
     expect(values['Description']).to eql ' .'
   end
-  
-  it "handles invalid" do
-    expect(get_exception{Suppository::DpkgDebLine.new "Boom Bang"}).to eql "can't parse line - 'Boom Bang'"
+
+  it 'handles invalid' do
+    expect(get_exception { Suppository::DpkgDebLine.new 'Boom Bang' }).to eql "can't parse line - 'Boom Bang'"
   end
-  
 end
-