right_publish 0.4.0 → 0.4.2

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.4.2

data/lib/right_publish/repo.rb

@@ -70,15 +70,13 @@ module RightPublish
     # @option options [String] :subdir a subdirectory (common prefix); only files matching this prefix will be included
     # @option options [Array] :filter  a whitelist of String glob patterns to filter files, i.e. ["*.rpm", "*.deb"]
     def annotate(options={})
+      Profile.log("Creating HTML directory listing for #{repo_human_name(@repository_type)} files...")
 
       options[:subdir] ||= repo_config[:subdir]
-      storage_type = options[:use_remote_storage] ? :remote_storage : :local_storage
-
-      Profile.log("Creating HTML directory listing from #{storage_type.to_s} storage for #{repo_human_name(@repository_type)} files...")
 
       files = []
       RightPublish::Storage.ls(
-        get_storage(Profile.config[storage_type][:provider]),
+        get_storage(Profile.config[:local_storage][:provider]),
         :subdir => options[:subdir]) do |file|
         files << file
       end

data/lib/right_publish/repos/apt.rb

@@ -6,10 +6,10 @@ module RightPublish
     REPO_KEY = :apt_repo
 
     REPO_OPTIONS = {
-      :dists => :addr_optional, 
-      :description => DEFAULT_DESCRIPTION, 
-      :auto => DEFAULT_APT_AUTO, 
-      :subdir => DEFAULT_APT_DIR, 
+      :dists => :addr_optional,
+      :description => DEFAULT_DESCRIPTION,
+      :auto => DEFAULT_APT_AUTO,
+      :subdir => DEFAULT_APT_DIR,
       :gpg_key_id => :attr_optional,
       :gpg_password => :attr_optional }
 
@@ -97,14 +97,15 @@ module RightPublish
     end
 
     def auto_repo_remove(repo_path, pkg, target)
-      sub_command = (pkg.end_with?(BIN_EXTENSION) && 'remove') || 'removesrc'
       pkg_name = AptRepo.pkg_parts(pkg)[:name]
-      Profile.log("Removing any existing files for #{pkg_name}")
+      filterlist  = "'$PackageType (== #{ (pkg.end_with?(BIN_EXTENSION) && 'deb') || 'dsc' }), Package (% #{pkg_name})'"
+
+      Profile.log("Removing any packages files using filterlist #{filterlist}")
 
       targets = (target && Array(target)) || repo_config[:dists]
       targets.each do |t|
         ask_passphrase = (repo_config[:gpg_key_id]) ? "--ask-passphrase" : ""
-        cmd = "reprepro #{ask_passphrase} -b #{repo_path} #{sub_command} #{t} #{pkg_name}"
+        cmd = "reprepro #{ask_passphrase} -b #{repo_path} removefilter #{t} #{filterlist}"
         if repo_config[:gpg_key_id]
           exited = shellout_with_password(cmd)
         else

data/lib/right_publish/repos/msi.rb

@@ -28,7 +28,6 @@ module RightPublish
     def annotate(options={})
       options[:subdir] ||= repo_config[:subdir]
       options[:filter] = ['*.msi']
-      options[:use_remote_storage] = true
       super(options)
     end
 

data/lib/right_publish/storage.rb

@@ -1,4 +1,5 @@
 require 'right_publish/profile'
+require 'stringio'
 
 module RightPublish
   class StorageManager
@@ -65,7 +66,8 @@ module RightPublish
         else
           remote_file = files.shift
           Profile.log("Synchronizing: #{remote_file.first}", :debug)
-          local_copy = dest_dir.files.create(:key=>remote_file.first, :body=>remote_file.last.body,
+          # Need to wrap the raw data in a stringio object or the call will fail on windows
+          local_copy = dest_dir.files.create(:key=>remote_file.first, :body=>StringIO.new(remote_file.last.body),
                                              :acl=>'public-read',
                                              :content_type => guess_mime_type(remote_file.first))
         end

data/lib/right_publish/stores/local.rb

@@ -1,5 +1,41 @@
-require 'fog'
 require 'digest/md5'
+require 'fog'
+# Fog loads these on demand. Preload this so we can monkey patch it below
+require 'fog/local/models/storage/files'
+
+module Fog
+  module Storage
+    class Local
+      class Files < Fog::Collection
+        # This method is exactly like the stock one except for using "rb" (force binary mode)
+        # instead of "r" for reading the file. On windows it defaults to text mode which 
+        # messes everything up.
+        def get(key, &block)
+          requires :directory
+          path = file_path(key)
+          if ::File.exists?(path)
+            data = {
+              :content_length => ::File.size(path),
+              :key            => key,
+              :last_modified  => ::File.mtime(path)
+            }
+            if block_given?
+              file = ::File.open(path, "rb")
+              while (chunk = file.read(Excon::CHUNK_SIZE)) && yield(chunk); end
+              file.close
+              new(data)
+            else
+              body = ::File.open(path,"rb") { |io| io.read }
+              new(data.merge!(:body => body))
+            end
+          else
+            nil
+          end
+        end
+      end
+    end
+  end
+end
 
 module RightPublish
   module LocalStorage

data/right_publish.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "right_publish"
-  s.version = "0.4.0"
+  s.version = "0.4.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

@@ -37,7 +37,7 @@ describe RightPublish::AptRepo do
             expected_dists.each do |dist|
               @remove_expectations[dist] ||= []
               @remove_expectations[dist] << RightPublish::AptRepo.pkg_parts(pkg)[:name]
-              
+
               @install_expectations[dist] ||= []
               @install_expectations[dist] << pkg
             end
@@ -47,13 +47,16 @@ describe RightPublish::AptRepo do
 
           system_calls = (pkgs.size * expected_dists.size) * 2
           @repo.should_receive(@system_func).times(system_calls).and_return do |cmd|
-            path, subcmd, distro, pkg = /reprepro\s+(?:--ask-passphrase )?(?:-C main )?-b\s+(.+)\s+(includedeb|includedsc|removesrc|remove)\s+([^\s]+)\s+([^\s]+)/.match(cmd).captures
+            path, subcmd, distro, pkg = /reprepro\s+(?:--ask-passphrase )?(?:-C main )?-b\s+(.+)\s+(includedeb|includedsc|removefilter)\s+([^\s]+)\s+(.+)$/.match(cmd).captures
             path.should be_eql(File.join(@cache_dir,@repo_subdir))
-
-            if @remove_expectations.has_key?(distro) && @remove_expectations[distro].include?(pkg)
-              subcmd.should include('remove') #can be remove or removesrc
+            # Now we are using listfilter, that is why our package name is really filter.
+            #   reprepro  -b somedir/fake/ removefilter quantal '$PackageType (== deb), Package (% foo)'
+            # We need to extract package name from '$PackageType (== deb), Package (% foo)'
+            real_pkg = pkg[35..-3] # 35 is an index of space after '%', and -3 is a index of ')'
+            if @remove_expectations.has_key?(distro) && @remove_expectations[distro].include?(real_pkg)
+              subcmd.should == 'removefilter'
               @remove_expectations.should be_has_key(distro)
-              @remove_expectations[distro].delete(pkg)
+              @remove_expectations[distro].delete(real_pkg)
               @remove_expectations.delete(distro) if @remove_expectations[distro].empty?
             else
               subcmd.should be_eql((pkg.end_with?(RightPublish::AptRepo::SRC_EXTENSION) && 'includedsc') || 'includedeb')

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: right_publish
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 11
   prerelease: 
   segments: 
   - 0
   - 4
-  - 0
-  version: 0.4.0
+  - 2
+  version: 0.4.2
 platform: ruby
 authors: 
 - Brian Szmyd
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-11-12 00:00:00 Z
+date: 2013-11-18 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement