suppository 0.0.2 → 0.0.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDViNGM2ZTY5OWUyYThmMzlmZjBmZGY0MzMwMWI5ZWFjYTdkNGY2Yw==
+    MGVlYmFkYTM5ODQwNGI1MDJlODA5YWQwMWMwYmNjOTNiY2I5ZjdlNg==
   data.tar.gz: !binary |-
-    YTdhOTczMGZjMzdmYTBjNzIxY2M4Y2U1ZDJkNTgzNmU3ZGVhNTYxNA==
+    M2FjZjA0ODRlNDczYTZjOWIwOWIwNDgzMjU1MmEyYTE4NmI1ODc2YQ==
 SHA512:
   metadata.gz: !binary |-
-    MjY3YmRjMGQ5ZjY2ZjM5NTQ0NjY1Y2JjYWQwYzFkN2VmZDljMTZhMzRjZDU1
-    OWM4MzE4M2U4ZjNiN2IzNzExNTVhN2ZhYWQ5MDIxZDk3YTUxNTg4MDFmZGE5
-    ODc0OGI0NTI0YzRhZDE2OTdhYjRmZjU5NDA2OWExZDlkNjI2Yjk=
+    Y2Q5NTlkYTBiNWU3NDJjMWQyNjYxNWU1NjhjZDBmODNhYzgzMTk2OTAzMTc2
+    NWVjYmI3MzRhMzY5NGExYWY5MDlhZTU5OTc4Yjc1MjQ3MTVjOTEzODk5NjMx
+    ZDUxMmUzYmIyMzkxYzFkZjM1MGI1ODg2NzIyMTJmNjk2MTY4Yjg=
   data.tar.gz: !binary |-
-    NjUyNWZmYjIzMzVhMDY3YTA0YTMxNmJlNWM2NTMyMWJmZmQ1N2NhMmU3MGVk
-    ZjBiODEyMjYyY2I5ZDI4MWMyNWVkY2MzNDQ4MjIwOGZiNTE1YTRlOTEzMThi
-    ZDZiNTNiYTZiYmE2OGY0YTFmNzNiMzQ2NWU4YzQ2Nzk1ZjQyMGE=
+    NGFlZGYwYTU4NWQzZWYwOGIxM2E5Y2ZjNzliMzkwMDkyNjIyZjk2YjJmYmE4
+    NjA4N2FkYzYyZjgzNmFkODg5ZDU0MzM3NzEzZGEzMTBmNzgwMjU1MDkzOTVh
+    MThhM2MzYzIyM2I0NmVkYzhiN2IyYjI5MTNlNWRjNTFjMTExODY=

data/README.md

@@ -1,5 +1,5 @@
 # Super Simple Apt Repository
-[![Build Status](https://travis-ci.org/TheBookPeople/suppository.svg?branch=develop)](https://travis-ci.org/TheBookPeople/suppository) [![Code Climate](https://codeclimate.com/github/TheBookPeople/suppository/badges/gpa.svg)](https://codeclimate.com/github/TheBookPeople/suppository) [![Test Coverage](https://codeclimate.com/github/TheBookPeople/suppository/badges/coverage.svg)](https://codeclimate.com/github/TheBookPeople/suppository) 
+[![Build Status](https://travis-ci.org/TheBookPeople/suppository.svg?branch=develop)](https://travis-ci.org/TheBookPeople/suppository) [![Code Climate](https://codeclimate.com/github/TheBookPeople/suppository/badges/gpa.svg)](https://codeclimate.com/github/TheBookPeople/suppository) [![Test Coverage](https://codeclimate.com/github/TheBookPeople/suppository/badges/coverage.svg)](https://codeclimate.com/github/TheBookPeople/suppository) [![Gem Version](https://badge.fury.io/rb/suppository.svg)](http://badge.fury.io/rb/suppository)
 
 Based on the ideas from Super Simple Apt Repository https://github.com/lukepfarrar/suppository.
 

data/lib/suppository/command_runner.rb

@@ -1,4 +1,4 @@
-
+require 'English'
 require 'suppository/exceptions'
 
 module Suppository

data/lib/suppository/release.rb

@@ -1,5 +1,3 @@
-require 'English'
-
 require 'suppository/exceptions'
 require 'suppository/command_runner'
 require 'fileutils'
@@ -14,44 +12,85 @@ module Suppository
     end
 
     def create
-      open(@release_file, 'w') { |f| f.puts content }
+      write_file
       sign unless @unsigned
     end
 
     private
 
-    def sign
-      gpg_file = "#{@release_file}.gpg"
-      FileUtils.rm_rf(gpg_file)
-      CommandRunner.new('gpg', "-abs -o #{gpg_file} #{@release_file}").run
+    def write_file
+      open(@release_file, 'w') { |f| f.puts content }
     end
 
-    # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
     def content
       result = "Codename: #{@dist}\n"
-      component_dirs = Dir.glob("#{@dist_path}/*").select { |f| File.directory? f }
-      components = component_dirs.collect { |d| File.basename(d) }.join(' ')
-      arch_dirs = Dir.glob("#{@dist_path}/*/*").select { |f| File.directory? f }
-      architectures = arch_dirs.collect { |d| File.basename(d).split('-')[1] }
-                      .uniq.join(' ')
       result << "Architectures: #{architectures}\n"
       result << "Components: #{components}\n"
-      result << "Date: #{Time.new.strftime('%a, %d %b %Y %H:%M:%S %Z')}\n"
-      packages = Dir.glob("#{@dist_path}/*/*/Packages*")
-      result << "MD5Sum:\n"
+      result << "Date: #{date}\n"
+      result << package_hashes
+    end
+
+    def package_hashes
+      result = md5_hashes
+      result << sha1_hashes
+      result << sha2_hashes
+      result << sha5_hashes
+    end
+
+    def md5_hashes
+      result = "MD5Sum:\n"
       packages.each { |f| result << puts_hash(f, Digest::MD5.file(f)) }
-      result << "SHA1:\n"
+      result
+    end
+
+    def sha1_hashes
+      result = "SHA1:\n"
       packages.each { |f| result << puts_hash(f, Digest::SHA1.file(f)) }
-      result << "SHA256:\n"
+      result
+    end
+
+    def sha2_hashes
+      result = "SHA256:\n"
       packages.each { |f| result << puts_hash(f, Digest::SHA256.file(f)) }
-      result << "SHA512:\n"
+      result
+    end
+
+    def sha5_hashes
+      result = "SHA512:\n"
       packages.each { |f| result << puts_hash(f, Digest::SHA512.file(f)) }
       result
     end
 
+    def sign
+      gpg_file = "#{@release_file}.gpg"
+      FileUtils.rm_rf(gpg_file)
+      CommandRunner.new('gpg', "-abs -o #{gpg_file} #{@release_file}").run
+    end
+
+    def packages
+      @packages ||= Dir.glob("#{@dist_path}/*/*/Packages*")
+    end
+
     def puts_hash(f, hash)
       relative = f.split(@dist_path).pop[1..-1]
       sprintf(" %s %17d %s\n", hash, File.size(f), relative)
     end
+
+    def date
+      Time.new.strftime('%a, %d %b %Y %H:%M:%S %Z')
+    end
+
+    def components
+      directories("#{@dist_path}/*").join(' ')
+    end
+
+    def architectures
+      directories("#{@dist_path}/*/*").collect { |d| d.split('-')[1] }.uniq.join(' ')
+    end
+
+    def directories(path_pattern)
+      directories = Dir.glob(path_pattern).select { |f| File.directory? f }
+      directories.collect { |d| File.basename(d) }
+    end
   end
 end

data/lib/suppository/version.rb

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

data/spec/suppository/release_spec.rb

@@ -9,28 +9,27 @@ RELEASE_CONTENT = <<-EOS
 Codename: lucid
 Architectures: amd64 i386
 Components: internal
-Date: Tue, 06 Jan 2015 00:43:13 GMT
+Date: [A-Za-z]{3}, [0-9]{2} [A-Za-z]{3} [0-9]{4} [0-9]{2}:[0-9]{2}:[0-9]{2} [A-Z]{3}
 MD5Sum:
- d41d8cd98f00b204e9800998ecf8427e                 0 dists/lucid/internal/binary-amd64/Packages
- 2f3e2442476f5464c314716ef684c02c               103 dists/lucid/internal/binary-amd64/Packages.gz
- d41d8cd98f00b204e9800998ecf8427e                 0 dists/lucid/internal/binary-i386/Packages
- 7c0c23a67294ee276556e2f7f0ad5bc2               102 dists/lucid/internal/binary-i386/Packages.gz
+ [a-f0-9]{32}[ 0-9]{18,18} internal/binary-amd64/Packages
+ [a-f0-9]{32}[ 0-9]{18,18} internal/binary-amd64/Packages.gz
+ [a-f0-9]{32}[ 0-9]{18,18} internal/binary-i386/Packages
+ [a-f0-9]{32}[ 0-9]{18,18} internal/binary-i386/Packages.gz
 SHA1:
- da39a3ee5e6b4b0d3255bfef95601890afd80709                 0 dists/lucid/internal/binary-amd64/Packages
- 3e9ac8f4be976f1c6a52c13a3a251dfec7c204e7               103 dists/lucid/internal/binary-amd64/Packages.gz
- da39a3ee5e6b4b0d3255bfef95601890afd80709                 0 dists/lucid/internal/binary-i386/Packages
- 14934aa27c0ea7148d5b94b0ff3c769cfa59a297               102 dists/lucid/internal/binary-i386/Packages.gz
+ [a-f0-9]{40}[ 0-9]{18,18} internal/binary-amd64/Packages
+ [a-f0-9]{40}[ 0-9]{18,18} internal/binary-amd64/Packages.gz
+ [a-f0-9]{40}[ 0-9]{18,18} internal/binary-i386/Packages
+ [a-f0-9]{40}[ 0-9]{18,18} internal/binary-i386/Packages.gz
 SHA256:
- e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855                 0 dists/lucid/internal/binary-amd64/Packages
- bce970b56be93d9280b806bf630b3c85332293212002dcb38eb9911c6dcd725c               103 dists/lucid/internal/binary-amd64/Packages.gz
- e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855                 0 dists/lucid/internal/binary-i386/Packages
- 6e2679e057b8b9fa202677d114914fb9d67d378445449983fc432c27becedc38               102 dists/lucid/internal/binary-i386/Packages.gz
+ [a-f0-9]{64}[ 0-9]{18,18} internal/binary-amd64/Packages
+ [a-f0-9]{64}[ 0-9]{18,18} internal/binary-amd64/Packages.gz
+ [a-f0-9]{64}[ 0-9]{18,18} internal/binary-i386/Packages
+ [a-f0-9]{64}[ 0-9]{18,18} internal/binary-i386/Packages.gz
 SHA512:
- cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e                 0 dists/lucid/internal/binary-amd64/Packages
- 8c5a6c5573e2b5e6e187cb8aa85a7d5cdbc941ba2dfbc705fb33404a643d5ddee64014a4a9d094151400ce4ac58946bff52e53e4b922485f06405637ab9e080b               103 dists/lucid/internal/binary-amd64/Packages.gz
- cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e                 0 dists/lucid/internal/binary-i386/Packages
- 2a977dcc902cb6105c5981d114fb5759b8bd3a0805b30d70b2b519ad17fed233a1bd62b5b705b187ac31ea6e3def0fa598c0731281e8be2de513757d5190be14               102 dists/lucid/internal/binary-i386/Packages.gz  
-
+ [a-f0-9]{128}[ 0-9]{18,18} internal/binary-amd64/Packages
+ [a-f0-9]{128}[ 0-9]{18,18} internal/binary-amd64/Packages.gz
+ [a-f0-9]{128}[ 0-9]{18,18} internal/binary-i386/Packages
+ [a-f0-9]{128}[ 0-9]{18,18} internal/binary-i386/Packages.gz
 EOS
   
   
@@ -47,6 +46,17 @@ EOS
     FileUtils.rm_r @repo_path if File.exist? @repo_path
   end
 
+  it "has correct content" do 
+     @instance.create
+     content = File.read(@release_file)
+     expect(Regexp.new(RELEASE_CONTENT).match content ).to be_truthy
+  end
+  
+  it "creates file" do 
+     @instance.create
+     expect(File.exists?(@release_file)).to eql true
+  end
+  
   it "creates file" do 
      @instance.create
      expect(File.exists?(@release_file)).to eql true

data/spec/suppository_spec.rb

@@ -1,4 +1,3 @@
-
 require 'spec_helper'
 require 'suppository/version'
 require 'English'

data/suppository.gemspec

@@ -18,6 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  spec.required_ruby_version = ">= 1.9.3"
   spec.add_development_dependency "rake", "~> 10.4"
   spec.add_development_dependency "bundler", '~> 1.7'
   spec.add_development_dependency 'rspec', '~> 3.1' 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: suppository
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - William Griffiths
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-09 00:00:00.000000000 Z
+date: 2015-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -252,7 +252,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='