twitterpunch 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c881f24bd1e7cc981175e5f5fb52f80a7725e12f
-  data.tar.gz: 7516403fe3be89a85cf8ac0a11427857a28119a7
+  metadata.gz: 7cb13b290389bd6f3b20b57181852594cf5bfcd0
+  data.tar.gz: a23c5888916326fd00d7e5bf21d30659b43d9358
 SHA512:
-  metadata.gz: 2e2a4303a64a59f3cee1c582b74706fdbff6f7095ea60b3b4adcbc2c3c85c404f384f07d1b94e7c9abaed2c6ee340f2dcd1f8292ccbc67602b7f19e58110ebe1
-  data.tar.gz: 6c147d09131b4393231a97d531fe029fa3101299aff4e0dc154c3223c49b9407f684020559bd1102d1f0ebbb48f7faa8a111661da831ad1045d96197b7c1b420
+  metadata.gz: 1c47fa244a2615e42532731e7a5c56076ca4b885058bf66613e2836d86150684d960fcb9f8ffb1add623aea146e3f458b6b2696519b8206981c7f9327eccb939
+  data.tar.gz: 5e7893d78b0c84c6d804e5d091996edb3b689a306a2e48ade06a51379e56190be1a7f2a97d082b5282b62af10df0861922cce21808a763b0ecfa47b1cfef6b3d

data/bin/twitterpunch

@@ -12,19 +12,19 @@ configfile = File.expand_path('~/.twitterpunch.yaml')
 config     = YAML.load_file(configfile) rescue {}
 
 optparse = OptionParser.new { |opts|
-  opts.banner = "Usage : twitterpunch [--debug] [--stream] [--install] [--version] [filename]
+  opts.banner = "Usage : twitterpunch [options] [filename]
 
     Twitterpunch is designed to work with PhotoBooth and OS X Folder Actions.
     When this script is called with the name of an image file, it will post the
     image to Twitter, along with a randomly chosen message and a hashtag.
 
     If you call the script with the --stream argument instead, it will listen
-    for tweets to that hashtag and download them to a specified directory. If
-    the tweet came from another user, Twitterpunch will speak it aloud.
+    for tweets to that hashtag and display them in a slideshow. If the tweet
+    came from another user, Twitterpunch will speak it aloud.
 
 "
 
-  opts.on("-d", "--debug", "Choose an alternate provisioning backend.") do
+  opts.on("-d", "--debug", "Display extra debugging information.") do
     config[:debug] = true
   end
 
@@ -32,11 +32,15 @@ optparse = OptionParser.new { |opts|
     config[:action] = :stream
   end
 
-  opts.on("--view", "Run photo viewer only.") do
+  opts.on("--view", "Run photo slideshow viewer only.") do
     config[:action] = :view
   end
 
-  opts.on("-g", "--genconfig", "Create a default configuration file.") do
+  opts.on("-a", "--authorize", "Authorize Twitterpunch with Twitter and write out a configuration file.") do
+    config[:action] = :configure
+  end
+  opts.on("-g", "--genconfig", "Deprecated config generation. Use --authorize instead.") do
+    puts 'NOTICE: [-g|--genconfig\ are deprecated. Please use --authorize instead'
     config[:action] = :configure
   end
 

data/lib/twitterpunch.rb

@@ -1,3 +1,7 @@
 module Twitterpunch
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
+
+  # Twitter application credentials
+  API_KEY    = 'STurW17Tj7HuoZ7dSzS0uSoIP'
+  API_SECRET = 'wTCOhbc2BDAWULHEILaBuXKoEMjbhTOhl0edPIxlTP6bUkie3C'
 end

data/lib/twitterpunch/configuration.rb

@@ -8,17 +8,9 @@ module Twitterpunch
     def initialize(file)
       @configfile = file
 
-      puts "Set up your application at https://twitter.com/apps/"
-      puts "then enter your 'Consumer key' and 'Consumer secret':"
-
-      print "Consumer key: "
-      @consumer_key = STDIN.readline.chomp
-      print "Consumer secret: "
-      @consumer_secret = STDIN.readline.chomp
-
       consumer = OAuth::Consumer.new(
-        @consumer_key,
-        @consumer_secret,
+        Twitterpunch::API_KEY,
+        Twitterpunch::API_SECRET,
         {
           :site   => 'https://api.twitter.com/',
           :scheme => :header,
@@ -26,7 +18,8 @@ module Twitterpunch
 
       request_token = consumer.get_request_token
 
-      puts "Visit #{request_token.authorize_url} in your browser to authorize the app"
+      puts 'Please authorize Twitterpunch to post to your Twitter account.'
+      puts "Visit #{request_token.authorize_url} in your browser."
       # if we're on a Mac, open the page automatically
       system("open #{request_token.authorize_url} 2>/dev/null")
 
@@ -40,10 +33,10 @@ module Twitterpunch
       config = YAML.load_file(@configfile) rescue defaults
 
       config[:twitter] = {
-        :consumer_key        => "#{@consumer_key}",
-        :consumer_secret     => "#{@consumer_secret}",
-        :access_token        => "#{@access_token.token}",
-        :access_token_secret => "#{@access_token.secret}"
+        :consumer_key        => Twitterpunch::API_KEY,
+        :consumer_secret     => Twitterpunch::API_SECRET,
+        :access_token        => @access_token.token,
+        :access_token_secret => @access_token.secret
       }
 
       File.open(@configfile, 'w') {|f| f.write(config.to_yaml) }

data/lib/twitterpunch/streamer.rb

@@ -1,7 +1,7 @@
 require 'rubygems'
 require 'yaml'
 require 'twitter'
-require "net/http"
+require 'net/http'
 
 require 'twitterpunch/logger'
 
@@ -9,11 +9,20 @@ module Twitterpunch
   class Streamer
     def initialize(config)
       @config = config
+      @viewer = config[:display]
       @client = Twitter::Streaming::Client.new(config[:twitter])
       @logger = Twitterpunch::Logger.new(config)
       @output = File.expand_path(config[:photodir])
-      @handle = Twitter::REST::Client.new(config[:twitter]).current_user.screen_name
-      @viewer = config[:display]
+
+      begin
+        @handle = Twitter::REST::Client.new(config[:twitter]).current_user.screen_name
+      rescue Twitter::Error => e
+        puts "Cannot retrieve Twitter username."
+        puts "It's likely that you're on Windows and your SSL environment isn't complete"
+        puts "Download http://curl.haxx.se/ca/cacert.pem and set the environment variable"
+        puts "SSL_CERT_FILE to point to it."
+        puts e.message
+      end
 
       FileUtils.mkdir_p(@output) unless File.directory?(@output)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: twitterpunch
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Ben Ford
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-01 00:00:00.000000000 Z
+date: 2014-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: twitter
@@ -131,13 +131,13 @@ files:
 - LICENSE
 - README.md
 - bin/twitterpunch
-- lib/twitterpunch.rb
 - lib/twitterpunch/configuration.rb
 - lib/twitterpunch/logger.rb
 - lib/twitterpunch/poster.rb
 - lib/twitterpunch/sprite.rb
 - lib/twitterpunch/streamer.rb
 - lib/twitterpunch/viewer.rb
+- lib/twitterpunch.rb
 - resources/Tahoma Bold.ttf
 - resources/Twitterpunch.workflow/Contents/Info.plist
 - resources/Twitterpunch.workflow/Contents/QuickLook/Thumbnail.png
@@ -172,7 +172,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: A simple tool to automate the posting and streaming of PhotoBooth shots over