aptly-watcher 0.3.1 → 0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4aad45eba38cd86eeed010e57bf5badec8173f82
-  data.tar.gz: f9a3764bd2d38f9e0b3c7ea10329a1f152add3d6
+  metadata.gz: 559666bf483b86bfe158a4a8b658efe788bc1668
+  data.tar.gz: a3260100fbe61e3b5c6b4613cc4940aa96a20c60
 SHA512:
-  metadata.gz: 11f8130fd522beb170524ced1a20100f1a05fd3f20d51bca24494ac8d3d14378f6fad608b55f6aec9c5896d98b18e7ba646f922df09ae3ab9b6339a44e618a55
-  data.tar.gz: f7e3b07cdd5921dfba0dc6aa285370b7e20e8e8417d8549b626af89506edce75c5035633f494008f364b2f3313a15f72085f4665998666ed97636f67fa962df7
+  metadata.gz: f01dc300b5ebd7cd0c3b3b912497d1e58d6e96332a8a2d0919f2cf655f014ce590a5f38089413383f4814b705b030f7d53db873b4bb91a3a72f0690cf8a08e9f
+  data.tar.gz: 4447ce3cbe77c308f6807ccbd9a9ea45422111ff8d86a4e2a19cbd1e919f7ac186ee0d9179c7d884a9a1aa6d8cce602fe318267f8c350ff9a31ff0f209d19f3d

data/README.md

@@ -26,15 +26,17 @@ First you need to create a config file as such (we parse tildes to `ENV['HOME']`
 
 ```yaml
 ---
-:distrib:      myapp
-:repos:
+:distrib:      myapp                  # the distribution (or the name of your app)
+:repos:                               # the repos to create and publish
   - stable
   - testing
-:log:          ~/watcher.log         # use '-' for STDOUT
-:conf:         ~/aptly.conf
-:pidfile:      ~/aptly-watcher.pid
-:incoming_dir: ~/incoming
-:user:         aptly
+:log:          ~/watcher.log          # use '-' for STDOUT, false to disable
+:redis_log:    aptly:watcher:log      # the redis list to log into, set as false to disable
+:conf:         ~/aptly.conf           # the location of the aptly conf file
+:pidfile:      ~/aptly-watcher.pid    # the location of the aptly-watcher pidfile
+:incoming_dir: ~/incoming             # the base incoming directory
+:user:         aptly                  # the user to own the aptly directory after adding/publishing
+:group:        aptly                  # the group to own the aptly directory after adding/publishing
 ```
 
 Then you can run the watcher with the config file:

data/lib/aptly/watcher.rb

@@ -11,12 +11,22 @@ module Aptly
     class << self
 
       def redis
+        return nil if @config[:redis_log] == false
         @redis ||= Redis.new
       end
 
       def logger
         return @logger if @logger
-        target = (@config[:log] == '-') ? STDOUT : @config[:log]
+
+        target = case @config[:log]
+        when '-'
+          STDOUT
+        when false
+          '/dev/null'
+        else
+          @config[:log]
+        end
+
         @logger ||= Logger.new target, 0, 1024000
       end
       
@@ -31,13 +41,21 @@ module Aptly
         end
       end
 
-      # log into redis so we can pick it up in the DMS
       def log(level, message)
+        message.chomp.lines.each_with_index do |line, index|  # multi line logging
+          line.chomp!
+          line = "  #{line}" unless index.zero?
+          redis_log(level, line)          if @config[:redis_log] != false
+          logger.send(level.to_sym, line) if @config[:log]       != false
+        end
+      end
+
+      def redis_log(level, message)
+        return false if redis.nil?
         timestamp = Time.now.strftime('%Y-%m-%d %H:%M:%S')
         msg       = "#{level[0].upcase}, [#{timestamp}] #{level.upcase} -- #{message}"
-        redis.lpush("aptly:watcher:log", msg)
-        redis.ltrim("aptly:watcher:log", 0, 99)
-        logger.send(level.to_sym, message)
+        redis.lpush(@config[:redis_log], msg)
+        redis.ltrim(@config[:redis_log], 0, 99)
       end
 
       # run the watcher with the given config
@@ -54,8 +72,8 @@ module Aptly
           notifier.watch(repo_dir, :close_write) do |event|
             begin
               dispatcher.process(repo_dir, event, repo)
-              log :info, "Successfully added #{event.name} to #{repo}"
-              system "chown #{config[:user]}:#{config[:user]} #{config[:aptly]['rootDir']} -R"
+              log :info, "Successfully added #{event.name} to #{config[:distrib]}/#{repo}"
+              system "chown #{config[:user]}:#{config[:group]} #{config[:aptly]['rootDir']} -R"
             rescue StandardError => e
               e.message.lines.each {|line| log :error, line.chomp }
             end

data/lib/aptly/watcher/aptly_shim.rb

@@ -10,19 +10,21 @@ module Aptly
       end
 
       def create
-        repo_list = `aptly repo list --raw`
+        repo_list = `aptly repo list #{config} --raw`
 
         # create a repo for each component
         @components.each do |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?
+          Aptly::Watcher.log :info, "Created repo #{@name}/#{repo}"
         end
 
         # publish the repos for the first time (empty)
-        unless `aptly publish list --raw`.include? @name # avoid raising an error
+        unless `aptly publish list #{config} --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?
+          Aptly::Watcher.log :info, "Published repos #{@components.join('/')} for #{@name}"
         end
       end
 

data/lib/aptly/watcher/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aptly-watcher
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: '0.4'
 platform: ruby
 authors:
 - Robert McLeod