Fixes bin/buffer and updates conventions

zph · zph · commit b7db9895a31f · 2015-04-04T23:41:41.000-04:00
Buffer's Ruby Client was written by a less experienced me. Changes: - Fixes issue with ARGF usage pointed out by @boscomonkey in #4. No, there was never an ARGF that allowed #chomp. Whoops ¯\_(ツ)_/¯! - Switches from YAML file to more 12-factor app configuration (ie ENV variables). Thurs `~/.bufferapprc` is no more, and `BUFFER_ACCESS_TOKEN` and `BUFFER_PROFILE_ID` must be set in environment. - Refactors code based on cleaner style.
diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-ruby-2.0.0-p195
+2.1.5
diff --git a/bin/buffer b/bin/buffer
@@ -1,31 +1,35 @@
 #!/usr/bin/env ruby
 
-$LOAD_PATH.unshift(File.dirname(__FILE__), '..', 'lib')
-
 require 'buffer'
+require 'logger'
 
-begin
-  require 'yaml'
+log_level = ENV['BUFFER_DEBUG'] ? Logger::INFO : Logger::ERROR
 
-  rc_file_path = File.expand_path('~/.bufferapprc')
-  raise Errno::ENOENT unless File.exists?(rc_file_path)
+LOG = Logger.new(STDOUT) { |l| l.log_level = log_level }
 
-  options = YAML.load_file(File.expand_path('~/.bufferapprc'))
-  if options.class == String
-    options_str = options.dup
-    options = Hash.new
-    options['access_token'], options['profile_index'] = options_str.split
-    options['verion'] = '0.0.0'
+def gather_message(argv)
+  args = argv.dup
+  case args.count
+  when 0 then abort("Please supply a message for Buffer Post.")
+  when 1 then args.first
+  else
+    args.join(" ")
   end
-rescue Errno::ENOENT
-  puts "You're missing the ~/.bufferapprc file. See the README for info."
-  exit 1
-rescue
-  puts "Please upgrade from older config file structure" if ENV['BUFF_DEBUG']
 end
 
-client = Buffer::Client.new(options['access_token'])
-id = client.profiles[options['profile_index'].to_i].id
+def main
+  token = Env.BUFFER_ACCESS_TOKEN
+  profile = Integer(Env.BUFFER_PROFILE_ID)
+
+  message = gather_message(ARGV)
+  client = Buffer::Client.new(token)
+  profile_id = client.profiles[profile].id
+  post_args = {text: message, profile_ids: [profile_id]}
+  LOG.info('#main.post_args') { post_args }
+  unless ENV['BUFFER_DEBUG']
+    client.create_update(body: post_args)
+    puts "Posted message."
+  end
+end
 
-response = client.create_update(body: {text: ARGF.chomp, profile_ids: [ id ] } )
-puts response if ENV['BUFF_DEBUG']
+main
diff --git a/buffer.gemspec b/buffer.gemspec
@@ -23,7 +23,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'guard-bundler'
   gem.add_development_dependency 'rb-fsevent'
   gem.add_development_dependency 'growl'
-  gem.add_development_dependency 'pry-full'
+  gem.add_development_dependency 'pry-uber'
 
   gem.add_runtime_dependency 'multi_json'
   gem.add_runtime_dependency 'yajl-ruby'
@@ -32,4 +32,5 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'hashie'
   gem.add_runtime_dependency 'rake'
   gem.add_runtime_dependency 'addressable'
+  gem.add_runtime_dependency 'environs'
 end
diff --git a/lib/buffer.rb b/lib/buffer.rb
@@ -3,6 +3,7 @@
 require "json"
 require "hashie/mash"
 require "addressable/uri"
+require 'environs'
 
 require "buffer/version"
 require "buffer/core"
