franz 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bdc8e2f8a34ec53cc121ba4c3208bcff7c52b496
-  data.tar.gz: 8f70dbf552fa97e18f0c435ecf2f05b96bdfdf0d
+  metadata.gz: ed57e3895c08ceb9e4c790783ebfc818b842a2a6
+  data.tar.gz: 3587e83adc31b60feb0414a58b972d2189e16910
 SHA512:
-  metadata.gz: aeff8102b0d4635749bfc9751ee01e5dcddb1674635c5130d997800d561c6f955a55575deb015590d2be6586d3bec7ce7d5414504eeb469ec0b251887bffc9d7
-  data.tar.gz: 9d9dba062334ea71d64a2be833a061911d3215738e7ff762695e69369f12071600f0a16619f77fffd2472bf51e2d0ba875d28a0a37b2f0bcd4a05b81f53a3206
+  metadata.gz: 6cc0f13bf692545d9c3dac1f7e24499dd8340c3a7985baf13baa098494ea4651195b54f11b0c40f9c988cc78f3d1eacfef7c1fd37bf6e5ea5ea226a3e753bd5c
+  data.tar.gz: 7fe602a97448c1fb006d916a9774c143fdbfc352d69ccbe32d5be9b1506999212cf538901bc6e0210f3ff4d9e4b1ea42bfc6fea91c1c6d6f2e7f774cb0406896

data/Readme.md

@@ -75,7 +75,7 @@ Just call for help!
         |  | |  |  , ;  /  /  ,.  | |   | |--'  ./__;     .'
         |  : \   ---'  ;  :   .'   \|   |/      ;   |  .'
         |  |,'         |  ,     .-./'---'       `---'
-        `--'            `--`---'                       v1.6.0
+        `--'            `--`---'                       v2.1.0
     
     
     Aggregate log file events and send them elsewhere
@@ -83,7 +83,7 @@ Just call for help!
     Usage: franz [<options>]
     
     Options:
-      --config, -c <s>:   Configuration file to use (default: config.json)
+      --config, -c <s>:   Configuration file to use
            --debug, -d:   Enable debugging output
            --trace, -t:   Enable trace output
          --log, -l <s>:   Log to file, not STDOUT
@@ -208,13 +208,17 @@ At Blue Jeans, we deploy Franz with Upstart. Here's a minimal config:
     stop on shutdown
     respawn
 
-    exec franz
+    exec franz --config /path/to/franz.json
 
 We actually use the [`bjn_franz` cookbook](https://github.com/sczizzo/bjn-franz-cookbook)
 for Chef.
 
 ### Changelog
 
+#### v2.1.0
+
+- Self-contained packages now available for OS X and Linux thanks to [Traveling Ruby](http://phusion.github.io/traveling-ruby) and [FPM](https://github.com/jordansissel/fpm).
+
 #### v2.0.0
 
 - Added new outputs: `StdOut`, `Kafka` (experimental)

data/VERSION

@@ -1 +1 @@
-2.1.0
+2.1.1

data/bin/franz

@@ -9,23 +9,10 @@ require 'trollop'
 require 'franz'
 
 
-# If we find a local config, try to use it
-# N.B. We'll fall back to the last guy listed here
-config = nil
-%w[
-  config.json
-  %{HOME}/.franz.json
-  /etc/franz/franz.json
-].each do |path|
-  config = path % ENV rescue next
-  break if File.exist? config
-end
-
-
 # Franz really only accepts a config file as an option, and that config file
 # has got to conform to a certain format. If you're unsure, just look at the
 # default options hashes in both Franz::Input and Franz::Output
-opts = Trollop::options(ARGV) do
+parser = Trollop::Parser.new do
   version Franz::VERSION
   banner Franz::ART + "\n\n" + <<-EOS.gsub(/^    /, '')
     #{Franz::SUMMARY}
@@ -34,12 +21,18 @@ opts = Trollop::options(ARGV) do
 
     Options:
   EOS
-  opt :config, 'Configuration file to use', type: :string, default: config
+  opt :config, 'Configuration file to use', type: :string, required: true
   opt :debug,  'Enable debugging output', default: false
   opt :trace,  'Enable trace output', default: false
   opt :log,    'Log to file, not STDOUT', type: :string, default: nil
 end
 
+opts = Trollop.with_standard_exception_handling(parser) do
+  raise Trollop::HelpNeeded if ARGV.empty?
+  parser.parse ARGV
+end
+
+
 Thread.abort_on_exception = true # Die quickly and with great ceremony
 
 config = Franz::Config.new opts[:config]

data/lib/franz/metadata.rb

@@ -21,9 +21,9 @@ module Franz
   EMAIL    = 'sclemmer@bluejeans.com'
 
   # Bundled extensions
-  TRAVELING_RUBY_VERSION = '20150210-2.1.5'
+  TRAVELING_RUBY_VERSION = '20150210-2.2.0'
   SNAPPY_VERSION = '0.0.11'
-  EM_VERSION = '1.0.5'
+  EM_VERSION = '1.0.4'
 
   # Every project deserves its own ASCII art
   ART      = <<-'EOART' % VERSION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: franz
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Sean Clemmer
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.5
+        version: 1.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.5
+        version: 1.0.4
 description: Aggregate log file events and send them elsewhere.
 email: sclemmer@bluejeans.com
 executables:
@@ -173,7 +173,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Aggregate log file events and send them elsewhere