pristine 0.0.1 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2889f95571ad2f6239fa667f0ed081b50acec970
-  data.tar.gz: 2a76345d192a025c5e21e5267c3dfb8c0c47602c
+  metadata.gz: 0eb20ebacf82b1dd7daf7bd2c0e50ab11aa03981
+  data.tar.gz: 119cbe33b15d18bb6c0b33688ea11f30a58d4900
 SHA512:
-  metadata.gz: 6b90553687cb391ab642fca0e01ae2b8af1bb72f0f05249959120f25f448c95fbda8912571fd4de61c6243819d0ad49e507aae555b9179acfaa7628a76c08b1d
-  data.tar.gz: b1b934659dd6f7776392f7bf3dc1dc90e1cf6e64bcd7451ad343bdc16c71f91282e5e78040d20dbe62e3581fd06f246d7b8516db1102f6018b53c3bb8b58b293
+  metadata.gz: 82c10c9cc9844f159342c4f4900f70c5c699e3bfeb90618d3816d9c2d7759fbab2e600b7374abd97a5b57995e296b0cd92fb396414636dc8b0f05ea3dc5093ee
+  data.tar.gz: f9576653c5505a01924903d6dbac8ac048ce0a6b7a7e2b4aadbb5b38186f339e6b754de4dbf6a5db3e9abacb7513aee5b1a980ca962b68087badef87b1480440

data/README.md

@@ -2,9 +2,25 @@
 
 Watches if any file managed by Puppet was modified.
 
+# Usage
+
+```
+$ ./bin/pristine -h
+Usage: pristine [options]
+        --config FILE                Config file
+    -l, --log FILE                   Log output
+    -f, --files                      Files list to watch
+    -h, --help                       Show this message
+        --version                    Show version
 ```
+
+# Example
+
+
+```
+$ git clone https://github.com/carlasouza/pristine.git; cd pristine
 $ ./example/create_example_files.sh
-$ ./bin/pristine example.config
+$ ./bin/pristine -c config.yaml
 W, [2016-04-17T19:18:34.376080 #29074]  WARN -- : /foo/bar does not exist.
 I, [2016-04-17T19:18:34.376153 #29074]  INFO -- : /tmp/pristine/example/ watcher created.
 I, [2016-04-17T19:18:34.376190 #29074]  INFO -- : /tmp/pristine/example/a watcher created.
@@ -22,6 +38,8 @@ I, [2016-04-17T19:19:28.959390 #29074]  INFO -- : /tmp/pristine/example/a/c - [:
 
 # TODO
 
+  * Arguments sanity check
+
   * Check if `puppet` is installed
 
   * Filter out concats from resources file
@@ -30,10 +48,10 @@ I, [2016-04-17T19:19:28.959390 #29074]  INFO -- : /tmp/pristine/example/a/c - [:
 
       If directory, monitor recursevly
 
-
   * Add `:access` to files that contain passwords
 
-  * Add a watcher to the `file_list` file
+  * Add a watcher to the `file_list` file and then reload itself upon modification
+
 
 
 # Copyright

data/bin/pristine

@@ -7,8 +7,5 @@ end
 require 'pristine/config'
 require 'pristine/daemon'
 
-config_file = ARGV.first
-abort('No configuration file specified') if config_file.nil?
-
-Pristine::Config.load config_file
+Pristine::Config.load ARGV
 Pristine::Daemon.run

data/lib/pristine/cli.rb

@@ -0,0 +1,10 @@
+require 'optparse'
+
+module Pristine
+  class CLI
+    def self.read(args = ARGV)
+
+    end
+  end
+end
+

data/lib/pristine/config.rb

@@ -1,25 +1,66 @@
-require 'parseconfig'
+require 'yaml'
+require 'optparse'
+require 'ostruct'
+require 'pristine/version'
 
 module Pristine
   class Config
 
+    DEFAULT_LOG = STDOUT
+    DEFAULT_FLAGS = :modify #Lets watch IN_MODIFY events for now
     DEFAULT_FILES_LIST = '/var/lib/puppet/state/resources.txt'
 
-    def self.load(config_file)
-      @config ||= ParseConfig.new(config_file)
+    def self.load(args)
+      @config = OpenStruct.new
+
+      parser = OptionParser.new do |opts|
+        opts.on_head('--config FILE', 'Config file') do |path|
+          @config[:config_file] = path
+          @config = OpenStruct.new(Hash[YAML::load(open(path)).map { |k, v| [k.to_sym, v] }])
+        end
+
+        # TODO
+#        opts.on('-F', '--foreground', 'Run on foreground') do |v|
+#          @config[:foreground] = v
+#        end
+
+        opts.on('-l', '--log FILE', 'Log output') do |v|
+          @config[:log] = v
+        end
+
+        # TODO
+#        opts.on('-f', '--flags x,y,z', Array, 'Systemcalls to watch') do |v|
+#          @config[:config_file] = v
+#        end
+
+        opts.on('-f', '--files FILE', 'Files list to watch') do |v|
+          @config[:files_list] = v
+        end
+
+        opts.on_tail("-h", "--help", "Show this message") do
+          puts opts
+          exit
+        end
+
+        opts.on_tail("--version", "Show version") do
+          puts Pristine::VERSION
+          exit
+        end
+      end
+      parser.parse(args)
+      parser.load(config.config_file) unless config.config_file.nil?
+
+      set_defaults
     end
 
     def self.config
       @config
     end
 
-    def self.flags
-      :modify #Lets watch IN_MODIFY events for now
-    end
-
+    # Specific for Puppet's resource.txt file
     def self.files_list
       list = []
-      File.open(config.params['files_list'] || DEFAULT_FILES_LIST, 'r') do |f|
+      File.open(@config.files_list, 'r') do |f|
         f.each_line do |line|
           if line.match(/^file/)
             list << line.split('[')[1].split(']').first
@@ -33,6 +74,12 @@ module Pristine
       @config.send method
     end
 
+    private
+    def self.set_defaults
+      @config.log ||= DEFAULT_LOG
+      @config.flags ||= DEFAULT_FLAGS
+      @config.files_list ||= DEFAULT_FILES_LIST
+    end
 
   end
 end

data/lib/pristine/daemon.rb

@@ -26,8 +26,10 @@ module Pristine
 
     def self.run
       set_target_files(Config.files_list)
-
       notifier.run
+    rescue Interrupt
+      notifier.stop
+      Log.info 'Stopped all watchers. Exiting.'
     end
 
   end

data/lib/pristine/log.rb

@@ -15,7 +15,7 @@ module Pristine
     private
 
     def self.log
-      @@log ||= Logger.new(Pristine::Config.params['log'] || STDOUT, 'weekly')
+      @@log ||= Logger.new(Pristine::Config.log, 'weekly')
       @@log
     end
 

data/lib/pristine/version.rb

@@ -1,3 +1,3 @@
 module Pristine
-  VERSION = '0.0.1'
+  VERSION = '0.0.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pristine
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
 platform: ruby
 authors:
 - Carla Souza
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-18 00:00:00.000000000 Z
+date: 2016-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rb-inotify
@@ -24,26 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.7
-- !ruby/object:Gem::Dependency
-  name: parseconfig
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.8
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.8
 description: Watches if any file managed by Puppet was modified.
 email:
 - contact@carlasouza.com
@@ -56,6 +36,7 @@ files:
 - README.md
 - bin/pristine
 - lib/pristine.rb
+- lib/pristine/cli.rb
 - lib/pristine/collector.rb
 - lib/pristine/config.rb
 - lib/pristine/daemon.rb