pushyd 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a7a636a06b2c41f7a69593b7a29b3bbac5d4686f
-  data.tar.gz: eb4120ba4105fcfba107739e43c0ea77f09492a6
+  metadata.gz: 2afb6ffc0b508f3e4f2a04bd947ec1a9e52833d1
+  data.tar.gz: 000db1acc65e2be1a87e0351b4aba6578aa7ac55
 SHA512:
-  metadata.gz: 88b640673acf8851e00ecd5b1d67ae58d6725e451d9eaee5d16de85b7ba59836ce6eb147ff98dd4f06e38cae1a38f10adc26e545ba686379d50921225c542844
-  data.tar.gz: b448ff79dc864883b158bfd49a257a15d8850090c18570e04014bc713efab8138232a534561ac2ccade53b47d42112c6e91347ed77144ab8b5d0c5f4d0e41d10
+  metadata.gz: 1efc1420e8d39d6df4a375239b9400cc9b868752cf9dc6549f75d0041607bcf25e65c251ea888a2adb8a35b35dfbedae182a6a1ac160fefae655bc0f6b8348a2
+  data.tar.gz: f5d231791ae1526e7e852c1f13c74457446961aa2d7610e62fa5273d797bfca52129a6d7fdc6b91c45bfb90a2f8b8c4e1723ae9f0be4b4ef510714e59faf9a06

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pushyd (0.4.2)
+    pushyd (0.5.0)
       bunny (~> 2.3)
       chamber (~> 2.9)
       daemons
@@ -16,9 +16,7 @@ GEM
     addressable (2.4.0)
     amq-protocol (2.0.1)
     ast (2.3.0)
-    astrolabe (1.3.1)
-      parser (~> 2.2)
-    bunny (2.3.1)
+    bunny (2.4.0)
       amq-protocol (>= 2.0.1)
     chamber (2.9.0)
       hashie (~> 3.3)
@@ -45,7 +43,7 @@ GEM
       ast (~> 2.2)
     powerpack (0.1.1)
     rainbow (2.1.0)
-    rake (11.1.2)
+    rake (11.2.2)
     rest-client (1.8.0)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 3.0)
@@ -63,18 +61,19 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.4.0)
     rspec-support (3.4.1)
-    rubocop (0.32.1)
-      astrolabe (~> 1.3)
-      parser (>= 2.2.2.5, < 3.0)
+    rubocop (0.40.0)
+      parser (>= 2.3.1.0, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
-      ruby-progressbar (~> 1.4)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-progressbar (1.8.1)
     terminal-table (1.6.0)
     thor (0.19.1)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.2)
+    unicode-display_width (1.0.5)
 
 PLATFORMS
   ruby
@@ -85,7 +84,7 @@ DEPENDENCIES
   pushyd!
   rake
   rspec
-  rubocop (~> 0.32.0)
+  rubocop
 
 BUNDLED WITH
    1.11.2

data/bin/pushyd

@@ -6,54 +6,54 @@ begin
   require "optparse"
   require 'daemons'
   require_relative "../lib/pushyd/conf"
-rescue LoadError
-  raise "EXITING: some basic libs were not found"
+rescue LoadError => e
+  raise "EXITING: some basic libs were not found (#{e.message})"
 end
-include PushyDaemon
 
 
 # Handle configuration
-APP_ROOT = File.expand_path(File.dirname(__FILE__) + "/../")
 begin
   # Defaults
   cmd_config = nil
   cmd_logfile = nil
-  cmd_env = "production"
-  cmd_dump = false
+
+  # Init Chamber-based configuration from Gemspec
+  Conf.init File.dirname(__FILE__) + "/../"
+  Conf.app_env = "production"
 
   # Parse options and check compliance
   OptionParser.new do |opts|
     opts.banner = "Usage: #{File.basename $PROGRAM_NAME} [options] start|stop"
     opts.on("-l", "--log LOGFILE")           { |path| cmd_logfile = File.expand_path(path)}
     opts.on("-c", "--config CONFIGFILE")     { |path| cmd_config = File.expand_path(path)}
-    opts.on("-e", "--environment ENV")       { |env| cmd_env = env }
-    opts.on("-d", "--dump")                  { cmd_dump = true }
-    opts.on("",   "--dev")                   { cmd_env = "development" }
+    opts.on("-e", "--environment ENV")       { |env| Conf.app_env = env }
+    opts.on("",   "--dev")                   { Conf.app_env = "development" }
   end.order!(ARGV)
 
-  # Build Chamber-based configuration from Gemspec with initial context
-  Conf.prepare root: APP_ROOT, gemspec: "pushyd", env: cmd_env, config: cmd_config, logfile: cmd_logfile
+  # Load Chamber-based configuration
+  Conf.prepare config: cmd_config, logfile: cmd_logfile
+
+  # Override log file
+  Conf[:log] ||= {}
+  Conf[:log][:file] = cmd_logfile.to_s if cmd_logfile
 
 rescue OptionParser::InvalidOption => e
   abort "EXITING: InvalidOption: #{e.message} \n #{e.backtrace.to_yaml}"
-rescue PushyDaemon::ConfigParseError => e
+rescue ConfigParseError => e
   abort "EXITING: ConfigParseError: #{e.message} \n #{e.backtrace.to_yaml}"
 rescue StandardError => e
   abort "EXITING: StandardError: #{e.message} \n #{e.backtrace.to_yaml}"
+else
 end
 
-# Display final configuration
-puts "--- #{Conf.name} #{Conf.version}"
-puts "Environment    \t #{Conf.env}"
+# Display final configuration, quit if config dump requested
+puts "--- #{Conf.app_name} #{Conf.app_ver}"
+puts "Environment    \t #{Conf.app_env}"
 puts "Config files   \t #{Conf.files}"
-puts "Loging to file \t #{Conf.log.file}"
-puts "YAML Parser    \t #{YAML.name}"
-
-# Quit if config dump requested
-if cmd_dump
-  puts Conf.dump
-  exit(0)
-end
+puts "Started at      \t #{Conf.app_started}"
+puts "Loging to file \t #{Conf[:log][:file]}" if Conf[:log].is_a? Enumerable
+puts
+puts Conf.dump
 
 # Run daemon
 run_options = {

data/lib/pushyd/conf.rb

@@ -1,104 +1,147 @@
 require "chamber"
 
-module PushyDaemon
-  class ConfigMissingParameter    < StandardError; end
-  class ConfigOtherError          < StandardError; end
-  class ConfigParseError          < StandardError; end
-
-  class Conf
-    extend Chamber
-
-    class << self
-      attr_reader :name
-      attr_reader :spec
-      attr_reader :files
-      attr_reader :version
-      attr_reader :env
-      attr_reader :host
-    end
+# FIXME: files named with hyphens will not be found by Chamber for now
+# FIXME: reloading of configuration from API
 
-    def self.prepare args = {}
-      # Context parameters
-      fail PushyDaemon::ConfigMissingParameter, "missing root" unless (@root = args[:root])
-      fail PushyDaemon::ConfigMissingParameter, "missing env"  unless (@env = args[:env])
-
-      # Gemspec parameter
-      gemspec_path = "#{args[:root]}/#{args[:gemspec]}.gemspec"
-      fail PushyDaemon::ConfigMissingParameter, "missing gemspec" unless args[:gemspec]
-      fail PushyDaemon::ConfigMissingParameter, "gemspec file not found: #{gemspec_path}" unless File.exist?(gemspec_path)
-
-      # Init host if missing
-      @host ||= `hostname`.to_s.chomp.split(".").first
-
-      # Load Gemspec
-      @spec     = Gem::Specification::load gemspec_path
-      @name     = @spec.name
-      @version  = @spec.version
-      fail PushyDaemon::ConfigMissingParameter, "missing name" unless @name
-
-      # Init Chamber (defaults, etc, cmdline)
-      @files = ["#{args[:root]}/defaults.yml"]
-      @files << File.expand_path("/etc/#{@name}.yml")
-      @files << args[:config].to_s if args[:config]
-
-      # Load configuration files
-      load files: @files, namespaces: { environment: @env }
-
-      # Override some values
-      self[:log] ||= {}
-      if args[:logfile]
-        self[:log][:file] = args[:logfile].to_s
-      end
-
-      # Init New Relic
-      prepare_newrelic self[:newrelic]
-
-      # Try to access any key to force parsing of the files
-      self[:dummy]
-
-    rescue Psych::SyntaxError => e
-      fail PushyDaemon::ConfigParseError, e.message
-    rescue StandardError => e
-      fail PushyDaemon::ConfigOtherError, "#{e.message} \n #{e.backtrace.to_yaml}"
-    end
+class ConfigMissingParameter    < StandardError; end
+class ConfigOtherError          < StandardError; end
+class ConfigParseError          < StandardError; end
+class ConfigMultipleGemspec     < StandardError; end
+class ConfigMissingGemspec      < StandardError; end
 
-    def self.dump
-      self.to_hash.to_yaml
-    end
+class Conf
+  extend Chamber
 
-    def Conf.newrelic_enabled?
-      !!self[:newrelic]
-    end
+  class << self
+    attr_accessor :app_env
+
+    attr_reader :app_root
+    attr_reader :app_libs
+
+    attr_reader :app_name
+    attr_reader :app_ver
+    attr_reader :app_started
+
+    attr_reader :spec
+    attr_reader :files
+    attr_reader :host
+    attr_reader :pidfile
+
+  end
 
-  protected
+  def self.init app_root = nil
+    # Defaults, hostname
+    @files    = []
+    @app_env  = "production"
+    @app_started  = Time.now
+    @host     = `hostname`.to_s.chomp.split(".").first
+
+    # Grab app root
+    @app_root = File.expand_path( File.dirname(__FILE__) + "/../../")
+    @app_libs = File.expand_path( File.dirname(__FILE__) )
+
+    # Try to find any gemspec file
+    matches   = Dir["#{@app_root}/*.gemspec"]
+    fail ConfigMissingGemspec, "gemspec file not found: #{gemspec_path}" if matches.size < 1
+    fail ConfigMultipleGemspec, "gemspec file not found: #{gemspec_path}" if matches.size > 1
+
+    # Load Gemspec (just the only match)
+    @spec     = Gem::Specification::load(matches.first)
+    @app_name = @spec.name
+    @app_ver  = @spec.version
+    fail ConfigMissingParameter, "gemspec: missing name" unless @app_name
+    fail ConfigMissingParameter, "gemspec: missing version" unless @app_ver
+
+    # Add config files
+    add_default_config
+    add_etc_config
+  end
+
+  def self.prepare args = {}
+    # Add extra config file
+    add_extra_config args[:config]
 
-    def self.prepare_newrelic section
-      unless section.is_a?(Hash)
-        # puts "prepare_newrelic: no config found"
-        ENV["NEWRELIC_AGENT_ENABLED"] = "false"
-        return
-      end
-      # puts "prepare_newrelic: #{section.inspect}"
+    # Load configuration files
+    load_files
 
-      # Enable GC profiler
-      GC::Profiler.enable
+    # Init New Relic
+    prepare_newrelic self[:newrelic], self.at(:logs, :newrelic)
 
-      # Enable module
-      ENV["NEWRELIC_AGENT_ENABLED"] = "true"
-      ENV["NEW_RELIC_MONITOR_MODE"] = "true"
+    # Prepare PID file is not present
+    prepare_pidfile
 
-      # License
-      ENV["NEW_RELIC_LICENSE_KEY"] = section[:licence].to_s
+    # Try to access any key to force parsing of the files
+    self[:dummy]
 
-      # Appname
-      platform = section[:platform] || self.host
-      section[:app_name] ||= "#{self.name}-#{platform}-#{self.env}"
-      ENV["NEW_RELIC_APP_NAME"] = section[:app_name].to_s
+  rescue Psych::SyntaxError => e
+    fail ConfigParseError, e.message
+  rescue StandardError => e
+    fail ConfigOtherError, "#{e.message} \n #{e.backtrace.to_yaml}"
+  end
+
+  def self.reload!
+    load_files
+  end
+
+  def self.dump
+    to_hash.to_yaml(indent: 4, useheader: true, useversion: false )
+  end
+
+  # Direct access to any depth
+  def self.at *path
+    path.reduce(Conf) { |m, key| m && m[key.to_s] }
+  end
 
-      # Logfile
-      ENV["NEW_RELIC_LOG"] = section[:logfile].to_s
+  def self.newrelic_enabled?
+    !!self[:newrelic]
+  end
+
+protected
+
+  def self.load_files
+    load files: @files, namespaces: { environment: @app_env }
+  end
+
+  def self.add_default_config
+    @files << "#{@app_root}/defaults.yml" if @app_root
+  end
+
+  def self.add_etc_config
+    @files << File.expand_path("/etc/#{@app_name}.yml") if @app_name
+  end
+
+  def self.add_extra_config path
+    @files << File.expand_path(path) if path
+  end
+
+  def self.prepare_pidfile
+    self[:pidfile] ||= "/tmp/#{@app_name}-#{@host}-#{self[:port]}.pid"
+  end
+
+  def self.prepare_newrelic section, logfile
+    # Disable NewRelic if no config present
+    unless section.is_a?(Hash)
+      ENV["NEWRELIC_AGENT_ENABLED"] = "false"
+      return
     end
 
+    # Enable GC profiler
+    GC::Profiler.enable
 
+    # Enable module
+    ENV["NEWRELIC_AGENT_ENABLED"] = "true"
+    ENV["NEW_RELIC_MONITOR_MODE"] = "true"
+
+    # License
+    ENV["NEW_RELIC_LICENSE_KEY"] = section[:licence].to_s
+
+    # Appname
+    platform = section[:platform] || self.host
+    section[:app_name] ||= "#{@app_name}-#{platform}-#{@app_env}"
+    ENV["NEW_RELIC_APP_NAME"] = section[:app_name].to_s
+
+    # Logfile
+    ENV["NEW_RELIC_LOG"] = logfile.to_s if logfile
   end
+
 end

data/lib/pushyd/daemon.rb

@@ -18,6 +18,8 @@ module PushyDaemon
       loop do
       end
 
+    rescue EndpointConnectionError => e
+      abort "EXITING #{e.class}: #{e.message}"
     rescue Errno::EACCES, StandardError => e
       abort "EXITING #{e.class}: #{e.message} \n #{e.backtrace.to_yaml}"
     end

data/pushyd.gemspec

@@ -1,7 +1,7 @@
 # coding: utf-8
 Gem::Specification.new do |spec|
   # Project version
-  spec.version                      = "0.4.2"
+  spec.version                      = "0.5.0"
 
   # Project description
   spec.name                         = "pushyd"
@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency   "rake"
   spec.add_development_dependency   "rspec"
   spec.add_development_dependency   "http", "~> 2.0"
-  spec.add_development_dependency   "rubocop", "~> 0.32.0"
+  spec.add_development_dependency   "rubocop"
   # spec.add_development_dependency "pry"
 
   # Runtime dependencies

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pushyd
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Bruno MEDICI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-10 00:00:00.000000000 Z
+date: 2016-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -70,16 +70,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.32.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.32.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: daemons
   requirement: !ruby/object:Gem::Requirement