grumblr 2.3.1 → 2.3.3

data/grumblr.gemspec

@@ -2,17 +2,17 @@ Gem::Specification.new do |s|
   s.name = 'grumblr'
   s.version = File.open('VERSION') { |f| f.read }
   s.author = 'Paul Philippov'
-  s.description = "Grumblr is a message poster to Tumblr blogs from GNOME"
+  s.description = "Grumblr is a message poster to Tumblr blogs."
   s.email = 'themactep@gmail.com'
   s.bindir = "bin"
   s.executables = ['grumblr']
   s.extra_rdoc_files = ['README', 'LICENSE', 'VERSION', 'Changelog']
   s.files = Dir.glob("{bin,data,lib,spec}/**/*") + \
-            %w(LICENSE README VERSION Changelog grumblr.gemspec)
+            %w(LICENSE README VERSION Changelog grumblr.gemspec setup.rb)
   s.homepage = 'http://themactep.com/grumblr/'
   s.require_path = "lib"
   s.rubyforge_project = 'grumblr'
-  s.summary = "Tumblr companion for GNOME"
+  s.summary = "a Tumblr companion"
   s.has_rdoc = false
   s.add_dependency "ppds-libs"
   s.add_dependency "libxml-ruby"

data/lib/grumblr/ui.rb

@@ -1,8 +1,11 @@
 require 'gtk2'
+require 'open-uri'
+require 'ftools'
 
 module Grumblr
 
   APP_NAME  = 'Grumblr'
+  APP_MOTTO = 'a Tumblr companion'
   APP_ROOT  = File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))
   DATA_ROOT = File.join(APP_ROOT, 'data')
   VERSION   = File.open(File.join(APP_ROOT,'VERSION')) { |f| f.read }
@@ -16,11 +19,11 @@ module Grumblr
 
       filename = File.join(Grumblr::DATA_ROOT, 'pixmaps', 'grumblr.svg')
       self.logo = Gdk::Pixbuf.new(filename, 128, 128)
-      
+
       set_size_request 440, 340
       set_border_width 0
       set_allow_shrink false
-      set_title Grumblr::APP_NAME
+      set_title "#{Grumblr::APP_NAME} #{Grumblr::VERSION}"
       set_icon self.logo
       set_default_width $cfg.get(:window_width).to_i
       set_default_height $cfg.get(:window_height).to_i
@@ -140,11 +143,13 @@ module Grumblr
         filter.add_mime_type "audio/*"
 
         audio_data = file_chooser_button :audio_data, filter
+        @audio_externally_hosted_url = Gtk::LabeledEntry.new 'Externally Hosted MP3 URL'
         @audio_caption = Gtk::LabeledTextView.new 'Caption (optional)'
 
         page = Gtk::VBox.new false, 4
         page.set_border_width 8
         page.pack_start audio_data, false
+        page.pack_start @audio_externally_hosted_url, false
         page.pack_start scrollable(@audio_caption), true
 
         @notebook.add_page_with_tab page, 'Audio'
@@ -192,11 +197,25 @@ module Grumblr
       end
       toolbar.insert 1, item
 
-      combo = Gtk::ComboBox.new
+      ### Blog selection combo
+      model = Gtk::ListStore.new(Gdk::Pixbuf, String)
+      combo = Gtk::ComboBox.new(model)
+
+      renderer = Gtk::CellRendererPixbuf.new
+      renderer.width = 24
+      combo.pack_start(renderer, false)
+      combo.set_attributes(renderer, :pixbuf => 0)
+
+      renderer = Gtk::CellRendererText.new
+      combo.pack_start(renderer, true)
+      combo.set_attributes(renderer, :text => 1)
+
       active_blog = $cfg.get(:active_blog) || nil
       active_blog_idx = nil
       $api.blogs.each_with_index do |blog, idx|
-        combo.append_text blog.title
+        iter = model.append
+        iter[0] = pixbuffer_from_url(blog.avatar_url)
+        iter[1] = blog.title
         active_blog_idx = idx if blog.name.eql?(active_blog)
         active_blog_idx = idx if active_blog_idx.nil? and blog.is_primary == "yes"
       end
@@ -287,15 +306,19 @@ module Grumblr
       tags = @tags.get_value.gsub(/\s+/,',').split(',').uniq.sort - ['']
 
       data = {
-        :generator  => 'Grumblr',
         :email      => $cfg.get(:email),
         :password   => $cfg.get(:password),
         :channel_id => $app.blog.name,
-        :group      => $app.blog.name + '.tumblr.com',
         :type       => message_type,
+        :generator  => "#{Grumblr::APP_NAME} #{Grumblr::VERSION}",
+        :private    => @private_button.active? ? 1 : 0,
         :tags       => tags.join(','),
         :format     => @format.active? ? 'markdown' : 'html',
-        :private    => @private_button.active? ? 1 : 0
+        :group      => $app.blog.name + '.tumblr.com',
+        #:slug       => ,
+        #:state      => , # published, draft, submission, queue
+        #:publish_on => , # e.g. publish-on=2010-01-01T13:34:00
+        #:send-to-twitter => , # no, auto, "message"
       }
 
       data.merge! mandatory_data
@@ -304,6 +327,8 @@ module Grumblr
 
       data.update({:data => File.read(data['data'])}) if data.has_key?('data') and data['data'] != ""
 
+      dump(data) if DEBUG
+
       $api.query 'write', data
       MessageDialog.new "Message posted", Gtk::Stock::DIALOG_INFO
       reset_form message_type
@@ -362,6 +387,16 @@ module Grumblr
       scroll.show_all
     end
 
+    def pixbuffer_from_url(url)
+      cache_dir = File.expand_path(File.join('~', '.cache', Grumblr::APP_NAME.downcase))
+      FileUtils.mkdir_p(cache_dir) unless File.directory?(cache_dir)
+      file = File.join(cache_dir, File.basename(url))
+      File.open(file, 'w') { |f| f.write(open(url).read) } unless File.exists?(file)
+      pb = Gdk::PixbufLoader.new
+      pb.set_size 16, 16
+      pb.last_write(open(file) { |f| f.read })
+      pb.pixbuf
+    end
   end
 
   class MessageDialog < Gtk::Dialog
@@ -457,8 +492,8 @@ module Grumblr
       self.logo          = $gui.logo
       self.program_name  = Grumblr::APP_NAME
       self.version       = Grumblr::VERSION
+      self.comments      = Grumblr::APP_MOTTO
       self.copyright     = "Copyright (c)2009, Paul Philippov"
-      self.comments      = "Tumblr companion for GNOME"
       self.license       = "New BSD License.\nhttp://creativecommons.org/licenses/BSD/"
       self.website       = "http://themactep.com/grumblr/"
       self.authors       = ['Paul Philippov <themactep@gmail.com>']
@@ -470,8 +505,8 @@ module Grumblr
   class StatusIcon < Gtk::StatusIcon
     def initialize
       super
-      self.file = File.join(Grumblr::DATA_ROOT, 'pixmaps', 'grumblr.svg')
-      self.tooltip = "Application Name Goes Here"
+      self.icon_name = 'grumblr'
+      self.tooltip = "#{Grumblr::APP_NAME} #{Grumblr::VERSION}"
       self.signal_connect(:activate) do
         if $gui.visible?
           $gui.minimize

data/lib/ppds/debug.rb

@@ -0,0 +1,5 @@
+require 'pp'
+
+def dump(data)
+  pp data
+end

data/lib/ppds/tumblr.rb

@@ -4,13 +4,36 @@ require 'xml'
 
 module Ppds
   class User < ClassFactory
-    attr_accessor :default_post_format, :can_upload_audio, :can_upload_aiff,
-                  :can_upload_video, :vimeo_login_url, :max_video_bytes_uploaded
+    attr_accessor :can_ask_question,
+                  :can_upload_aiff,
+                  :can_upload_audio,
+                  :can_upload_video,
+                  :default_post_format,
+                  :liked_post_count,
+                  :max_video_bytes_uploaded,
+                  :vimeo_login_url
   end
 
   class Blog < ClassFactory
-    attr_accessor :type, :title, :name, :url, :avatar_url,
-                  :is_primary, :private_id
+    attr_accessor :avatar_url,
+                  :backup_post_limit,
+                  :draft_count,
+                  :followers,
+                  :is_admin,
+                  :is_primary,
+                  :messages_count,
+                  :name,
+                  :posts,
+                  :private_id,
+                  :queue_count,
+                  :title,
+                  :twitter_enabled,
+                  :type,
+                  :url,
+                # with include-theme=1:
+                  :description,
+                  :custom_css,
+                  :theme_source
   end
 
   class Tumblr
@@ -23,7 +46,7 @@ module Ppds
       'quote' => ['quote'],
       'photo' => [],
       'video' => [],
-      'audio' => ['data']
+      'audio' => []
     }
 
     CONCURENT_FIELDS = {
@@ -33,7 +56,7 @@ module Ppds
       'quote' => [],
       'photo' => ['source', 'data'],
       'video' => ['embed', 'data'],
-      'audio' => []
+      'audio' => ['data', 'externally-hosted-url']
     }
 
     OPTIONAL_FIELDS  = {
@@ -56,6 +79,7 @@ module Ppds
     def query(action, data)
       raise 'Cannot authenticate without credentials' unless data[:email] and data[:password]
       response = RestClient.post(API_URL + action, data)
+      dump(response) if DEBUG
       response.to_str
     rescue RestClient::RequestFailed => e
       raise 'Query failed: %s' % e.response.body

data/setup.rb

@@ -0,0 +1,48 @@
+#!/usr/bin/env ruby
+
+require 'rubygems'
+require 'ftools'
+
+unless Process.uid == 0
+  puts "Must run as root"
+  exit
+end
+
+version = File.open('VERSION') { |f| f.read }
+
+Gem.path.each do |path|
+  puts "Checking out #{path}"
+  path = File.join(path, 'gems', "grumblr-#{version}")
+  unless File.directory?(path)
+    puts " Gem not found\n\n"
+    next
+  end
+  puts " Gem found!"
+  puts " Copying data:"
+
+  target = '/usr/share/pixmaps/grumblr.svg'
+  if File.exists?(target)
+    puts " - #{target} exists, skipping."
+  else
+    puts " + #{target} does not exist. copying"
+    File.copy File.join(path, 'data', 'pixmaps', 'grumblr.svg'),
+              target, :verbose => true
+  end
+
+  target = '/usr/share/applications/grumblr.desktop'
+  if File.exists?(target)
+    puts " - #{target} exists, skipping."
+  else
+    puts " + #{target} does not exist, copying"
+    File.copy File.join(path, 'data', 'grumblr.desktop'),
+              target, :verbose => true
+  end
+
+  target = '/usr/local/bin/grumblr'
+  if File.exists?(target)
+    puts " - #{target} exists, linking."
+  else
+    puts " + #{target} does not exist, copying"
+    File.symlink File.join(path, 'bin', 'grumblr'), target
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: grumblr
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 5
   prerelease: false
   segments: 
   - 2
   - 3
-  - 1
-  version: 2.3.1
+  - 3
+  version: 2.3.3
 platform: ruby
 authors: 
 - Paul Philippov
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-01 00:00:00 +07:00
+date: 2010-12-02 00:00:00 +06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -62,7 +62,7 @@ dependencies:
         version: 1.6.0
   type: :runtime
   version_requirements: *id003
-description: Grumblr is a message poster to Tumblr blogs from GNOME
+description: Grumblr is a message poster to Tumblr blogs.
 email: themactep@gmail.com
 executables: 
 - grumblr
@@ -76,24 +76,27 @@ extra_rdoc_files:
 files: 
 - bin/grumblr
 - data/grumblr.desktop
+- data/pixmaps/grumblr-plain.svg
+- data/pixmaps/grumblr.svg
+- data/pixmaps/video.bmp
 - data/pixmaps/photo.bmp
 - data/pixmaps/text.bmp
+- data/pixmaps/spinner.gif
+- data/pixmaps/link.bmp
+- data/pixmaps/grumblr.png
 - data/pixmaps/audio.bmp
 - data/pixmaps/chat.bmp
 - data/pixmaps/quote.bmp
-- data/pixmaps/grumblr.png
-- data/pixmaps/grumblr.svg
-- data/pixmaps/link.bmp
-- data/pixmaps/spinner.gif
-- data/pixmaps/video.bmp
-- lib/ppds/tumblr.rb
 - lib/grumblr/core.rb
 - lib/grumblr/ui.rb
+- lib/ppds/tumblr.rb
+- lib/ppds/debug.rb
 - LICENSE
 - README
 - VERSION
 - Changelog
 - grumblr.gemspec
+- setup.rb
 has_rdoc: true
 homepage: http://themactep.com/grumblr/
 licenses: []
@@ -127,6 +130,6 @@ rubyforge_project: grumblr
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: Tumblr companion for GNOME
+summary: a Tumblr companion
 test_files: []