aptly-watcher 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0075d97cdbdfb1ee8109e056d10b3394d24e1543
-  data.tar.gz: 10514a3381747764025f9e24aa82d257490315f3
+  metadata.gz: 4aad45eba38cd86eeed010e57bf5badec8173f82
+  data.tar.gz: f9a3764bd2d38f9e0b3c7ea10329a1f152add3d6
 SHA512:
-  metadata.gz: 65e14eac20a518b06f3f503c605554ed89dfa89310626c17cc8590aa3c9ebe3d86b047916996359fae1cf906d99116c1a35a8be4fdff5959e2f249b7e0a64f57
-  data.tar.gz: 67405c474d1fcb2d3a9fd1ebacde3cf6bf86f7782273d721e0c7bbada222492c6c16e2e0331e4715a71678952a6b2be761e6028f75fce13845d8012c8f168074
+  metadata.gz: 11f8130fd522beb170524ced1a20100f1a05fd3f20d51bca24494ac8d3d14378f6fad608b55f6aec9c5896d98b18e7ba646f922df09ae3ab9b6339a44e618a55
+  data.tar.gz: f7e3b07cdd5921dfba0dc6aa285370b7e20e8e8417d8549b626af89506edce75c5035633f494008f364b2f3313a15f72085f4665998666ed97636f67fa962df7

data/lib/aptly/watcher/aptly_shim.rb

@@ -12,16 +12,16 @@ module Aptly
       def create
         repo_list = `aptly repo list --raw`
 
+        # create a repo for each component
         @components.each do |repo|
-          next if repo_list.include? repo
-          output = `aptly repo create #{distrib} #{config} #{component(repo)} #{repo}`
+          next if repo_list.include? repo  # avoid raising an error
+          output = `aptly repo create #{distrib} #{config} #{component(repo)} #{repo} 2>&1`
           raise StandardError, "Failed to create repo #{repo}\n#{output}" unless $?.success?
         end
 
-        published_list = `aptly publish list --raw`
-
-        unless published_list.include? @name
-          output = `aptly publish repo #{config} #{distrib} #{component(:all)} #{component(:all, ' ')}`
+        # publish the repos for the first time (empty)
+        unless `aptly publish list --raw`.include? @name # avoid raising an error
+          output = `aptly publish repo #{config} #{distrib} #{component(:all)} #{@components.join(' ')} 2>&1`
           raise StandardError, "Failed to publish #{@name} for the first time\n#{output}" unless $?.success?
         end
       end
@@ -30,7 +30,7 @@ module Aptly
         # TODO: check if the file has already been added
         # TODO: check that the file is a Debian package
         output = `aptly repo add -remove-files=true #{config} #{repo} #{path} 2>&1`
-        raise StandardError, "Failed to add #{path} to #{repo(component)}\n#{output}" unless $?.success?
+        raise StandardError, "Failed to add #{path} to #{repo}\n#{output}" unless $?.success?
       end
 
       def publish
@@ -39,8 +39,8 @@ module Aptly
 
       private
 
-      def component(repo, joiner=',')
-        repo = @components.join(joiner) if repo == :all
+      def component(repo)
+        repo = @components.join(',') if repo == :all
         "-component=#{repo}"
       end
 

data/lib/aptly/watcher/version.rb

@@ -1,5 +1,5 @@
 module Aptly
   module Watcher
-    VERSION = "0.3.0"
+    VERSION = "0.3.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aptly-watcher
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Robert McLeod
@@ -122,7 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Watches folders and adds them to their relative aptly repository