twitterpunch 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b8362aed8fc073bc763307c26112f5f053063ff
-  data.tar.gz: 052ff8f173251398173c89f4150ebd4682765808
+  metadata.gz: 96c566d4bdc10313e9efc77b92c9cfa407048617
+  data.tar.gz: 59b7a93bd2cdda89c79cc1b99f2811a77b1230e4
 SHA512:
-  metadata.gz: d54befe3240d10e2f577da3dfec8b983b744b56f69be43215f46a45ac9a8e0a9842f065643cb4e0464e081244791187767d8845f54307b5d0925b40d6999a349
-  data.tar.gz: 4cb3f30a5ef4c3410b341455e2bc2addaa000f02851eac7564f7dd18679e09615ee59cd16dc583b737506372395c1d7c3a7ffa05a2c0adaf066b95ef508b7df7
+  metadata.gz: 17cfa29c54696a7dcdecb8ee77c03b3cdbd2c2c0d30479b77abce4722a2f519159939e3d37037da74ea6dda61f235c18fb33e4a0e7261bfbf11278c733e8cf29
+  data.tar.gz: fc1a39f9a4a93b7896510d48242f3ad968a7ccf8721ee3d966195c0286ab470c706b87fa7b84ffc266d01114d71a7ba5e53feef3bc838e07cb67b58f9ef04e71

data/bin/twitterpunch

@@ -32,6 +32,10 @@ optparse = OptionParser.new { |opts|
     config[:action] = :stream
   end
 
+  opts.on("--view", "Run photo viewer only.") do
+    config[:action] = :view
+  end
+
   opts.on("-g", "--genconfig", "Create a default configuration file.") do
     config[:action] = :configure
   end
@@ -54,20 +58,35 @@ optparse = OptionParser.new { |opts|
 }
 optparse.parse!
 
+config[:action]    = :post if ARGV.size > 0 and config[:action].nil?
 config[:resources] = File.expand_path("#{File.dirname(__FILE__)}/../resources")
-config[:action] = :post if ARGV.size > 0 and config[:action].nil?
 
 case config[:action]
 when :stream
   require 'twitterpunch/streamer'
-  client = Twitterpunch::Streamer.new(config)
-  client.stream
+  require 'twitterpunch/viewer'
+
+  statefile      = File.expand_path('~/.twitterpunch.state')
+  config[:state] = YAML.load_file(statefile) rescue {}
+
+  Twitterpunch::Streamer.new(config).thread
+  Twitterpunch::Viewer.new(config)
+
+  File.open(statefile, 'w') {|f| f.write(config[:state].to_yaml) }
 
 when :post
   require 'twitterpunch/poster'
   client = Twitterpunch::Poster.new(config)
   client.post(ARGV)
 
+when :view
+  require 'twitterpunch/viewer'
+
+  statefile      = File.expand_path('~/.twitterpunch.state')
+  config[:state] = YAML.load_file(statefile) rescue {}
+
+  client = Twitterpunch::Viewer.new(config)
+
 when :configure
   require 'twitterpunch/configuration'
   cfg = Twitterpunch::Configuration.new(configfile).save
@@ -80,3 +99,4 @@ else
   puts "Run twitterpunch --help for usage."
   exit 1
 end
+

data/lib/twitterpunch.rb

@@ -1,3 +1,3 @@
 module Twitterpunch
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/lib/twitterpunch/configuration.rb

@@ -56,6 +56,9 @@ module Twitterpunch
           "I'm a posting fool",
           "minimally viable product"
         ],
+        :viewer    => {
+          :count => 5,
+        },
         :hashtag   => "BestHalloweenPartyEver",
         :handle    => "fassford",
         :photodir  => "~/Pictures/twitterpunch/",

data/lib/twitterpunch/sprite.rb

@@ -0,0 +1,65 @@
+require 'rubygems'
+require 'rubygame'
+
+module Twitterpunch
+  class Sprite
+    include Rubygame
+    include Sprites::Sprite
+
+    def initialize(dimensions, image, text)
+      # Invoking the base class constructor is important and yet easy to forget:
+      super()
+
+      @dimensions = dimensions
+
+      @rate = rand(35..150)
+      @zoom = rand(50..100) / 100.0
+
+      # @image and @rect are expected by the Rubygame sprite code
+      @image = Surface.load(image).zoom(@zoom)
+
+      max_width = dimensions[0] * 0.75
+      if @image.width > max_width
+        @image = @image.zoom(max_width/@image.width)
+      end
+
+      @top  = 0 - @image.height
+      @left = (dimensions[0] - @image.width ) * rand
+      @rect = @image.make_rect
+
+      if text
+        @text = $font.render_utf8(text, true, Color[:black], Color[:gray])
+        @text.alpha = 150
+
+        # Determine the dimensions in pixels of the area used to render the text.  The
+        # "topleft" of the returned rectangle is at [ 0, 0]
+        rt = @text.make_rect
+
+        # Re-use the "topleft" of the rectangle to indicate where the text should
+        # appear on screen ( lower left corner )
+        #rt.topleft = [ 12, @image.height - rt.height - 8]
+        rt.topleft = [ 0, @image.height - rt.height]
+
+        # Copy the pixels of the rendered text to the image
+        @text.blit(@image, rt)
+      end
+    end
+
+    # Animate this object.  "seconds_passed" contains the number of ( real-world)
+    # seconds that have passed since the last time this object was updated and is
+    # therefore useful for working out how far the object should move ( which
+    # should be independent of the frame rate)
+    def update(seconds_passed)
+      @top += seconds_passed * @rate
+      @rect.topleft = [ @left, @top ]
+    end
+
+    def draw(on_surface)
+      @image.blit(on_surface, @rect)
+    end
+
+    def visible
+      @top < @dimensions[1]
+    end
+  end
+end

data/lib/twitterpunch/streamer.rb

@@ -16,6 +16,12 @@ module Twitterpunch
       FileUtils.mkdir_p(@output) unless File.directory?(@output)
     end
 
+    def thread
+      Thread.new do
+        stream
+      end
+    end
+
     def stream
       begin
         @client.filter(:track => @config[:hashtag]) do |tweet|
@@ -23,9 +29,11 @@ module Twitterpunch
             @logger.info(tweet.text)
             @logger.log(tweet.user.screen_name, tweet.text)
 
+            content = tweet.text.gsub(/ http\S*/,'').gsub(/#\S*/,'')
+
 
             unless tweet.user.screen_name == @config[:handle]
-              message = "#{tweet.user.name} says #{tweet.text.gsub(/ http\S*/,'').gsub(/#\S*/,'')}"
+              message = "#{tweet.user.name} says #{content}"
 
               case RUBY_PLATFORM
               when /mingw|cygwin/
@@ -42,12 +50,18 @@ module Twitterpunch
               request  = Net::HTTP::Get.new(uri.request_uri)
               response = http.request(request)
 
-              File.open("#{@output}/#{File.basename uri.path}", 'wb') do |file|
+              image    = File.basename uri.path
+
+              File.open("#{@output}/#{image}", 'wb') do |file|
                 file.write(response.body)
               end
 
+              unless tweet.user.screen_name == @config[:handle]
+                @config[:state][image] = content
+              end
+
               # OS X screensaver doesn't reload images dynamically. This kinda sucks.
-              if RUBY_PLATFORM =~ /darwin/
+              if RUBY_PLATFORM =~ /darwin/ and not @config.has_key? :viewer
                 system('osascript', '-e', 'tell application "System Events" to stop current screen saver')
                 system('osascript', '-e', 'tell application "System Events" to start current screen saver')
               end

data/lib/twitterpunch/viewer.rb

@@ -0,0 +1,101 @@
+require 'rubygems'
+require 'rubygame'
+require 'yaml'
+require 'twitterpunch/sprite'
+
+module Twitterpunch
+  class Viewer
+    include Rubygame
+
+    def initialize(config)
+      @config = config
+      @state  = YAML.load_file(File.expand_path('~/.twitterpunch.state')) rescue {}
+      srand
+
+      if @config.has_key? :viewer
+        run
+      else
+        puts 'Press enter to exit'
+        STDIN.gets
+      end
+    end
+
+    def run
+      onscreen = @config[:viewer][:count] || 5
+
+      # Set up the TrueType Font module
+      TTF.setup
+      point_size = 20
+      $font = TTF.new("#{@config[:resources]}/Tahoma Bold.ttf", point_size)
+
+      #@screen = Screen.open [ 640, 480]
+      default_depth = 0
+      maximum_resolution = Screen.get_resolution
+
+      screen = Screen.open(maximum_resolution, default_depth, [ HWSURFACE, DOUBLEBUF, FULLSCREEN])
+
+      screen.show_cursor = false
+
+      clock = Clock.new
+      clock.target_framerate = 60
+
+      # Ask Clock.tick() to return ClockTicked objects instead of the number of
+      # milliseconds that have passed:
+      clock.enable_tick_events
+
+      # Create a new group of sprites so that all sprites in the group may be updated
+      # or drawn with a single method invocation.
+      sprites = Sprites::Group.new
+      Sprites::UpdateGroup.extend_object(sprites)
+      onscreen.times do
+        sprites << Twitterpunch::Sprite.new(maximum_resolution, *next_image)
+      end
+
+      #@background = Surface.load("background.png").zoom_to(maximum_resolution[0], maximum_resolution[1])
+      # Create a background image and copy it to the screen. With no image, it's just black.
+      background = Surface.new(maximum_resolution)
+      background.blit(screen, [ 0, 0])
+
+      event_queue = EventQueue.new
+      event_queue.enable_new_style_events
+
+      should_run = true
+      while should_run do
+        seconds_passed = clock.tick().seconds
+
+        event_queue.each do |event|
+          case event
+            when Events::QuitRequested, Events::KeyReleased
+              should_run = false
+          end
+        end
+
+        # remove all sprites who've gone out of sight
+        sprites.reject { |sprite| sprite.visible }.each do |sprite|
+          sprite.kill
+          sprites << Twitterpunch::Sprite.new(maximum_resolution, *next_image)
+        end
+
+        # "undraw" all of the sprites by drawing the background image at their
+        # current location ( before their location has been changed by the animation)
+        sprites.undraw(screen, background)
+
+        # Give all of the sprites an opportunity to move themselves to a new location
+        sprites.update(seconds_passed)
+
+        # Draw all of the sprites
+        sprites.draw(screen)
+
+        screen.flip
+      end
+
+    end
+
+    def next_image
+      image = Dir.glob(File.expand_path("#{@config[:photodir]}/*")).sample
+      text  = @config[:state][File.basename(image)]
+      return image, text
+    end
+
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: twitterpunch
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Ben Ford
@@ -52,6 +52,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubygame
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: "Twitterpunch\n===============\n\nTwitterpunch is designed to work with
   PhotoBooth and OS X Folder Actions.\nWhen this script is called with the name of
   an image file, it will post the\nimage to Twitter, along with a message randomly
@@ -114,7 +128,10 @@ files:
 - lib/twitterpunch/configuration.rb
 - lib/twitterpunch/logger.rb
 - lib/twitterpunch/poster.rb
+- lib/twitterpunch/sprite.rb
 - lib/twitterpunch/streamer.rb
+- lib/twitterpunch/viewer.rb
+- resources/Tahoma Bold.ttf
 - resources/Twitterpunch.workflow/Contents/Info.plist
 - resources/Twitterpunch.workflow/Contents/QuickLook/Thumbnail.png
 - resources/Twitterpunch.workflow/Contents/document.wflow
@@ -123,7 +140,16 @@ files:
 homepage: http://binford2k.com
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message: |2+
+
+    ************************************************************************
+    Be aware that RubyGame is BROKEN on OSX right now. You will need this
+    patch before Twitterpunch will work properly:
+
+    https://github.com/xrs1133/ruby-sdl-ffi/commit/0b721ac4659b4c08cda5aa2f418561a8a311e85b
+
+    ************************************************************************
+
 rdoc_options: []
 require_paths:
 - lib