tumblr-rb 1.3.0 → 2.0.0.alpha

data/.travis.yml

@@ -0,0 +1,7 @@
+language: ruby
+bundler_args: --without development
+rvm:
+  - 1.8.7
+  - 1.9.3
+  - jruby-18mode
+  - jruby-19mode

data/Gemfile

@@ -1,12 +1,19 @@
 source 'http://rubygems.org'
 
-gem 'weary','>= 0.7.1'
-gem 'highline', '>= 1.5.2'
+gemspec
+
+gem "rake", "~> 0.9.2"
 
 group :test do
-	gem 'rake'
-	gem 'redgreen'
-	gem 'contest'
-	gem 'vcr', '>= 0.3.1'
-	gem 'jeweler'
-end
+  gem "rspec", "~> 2.11.0"
+  gem "webmock", "~> 1.8.5"
+  gem "rack-test", "~> 0.6.1"
+end
+
+group :development do
+  gem "ronn"
+end
+
+platforms :jruby do
+  gem "jruby-openssl"
+end

data/Gemfile.lock

@@ -1,65 +1,65 @@
---- 
-dependencies: 
-  contest: 
-    group: 
-    - :test
-    version: ">= 0"
-  rake: 
-    group: 
-    - :test
-    version: ">= 0"
-  highline: 
-    group: 
-    - :default
-    version: ">= 1.5.2"
-  weary: 
-    group: 
-    - :default
-    version: ">= 0.7.1"
-  vcr: 
-    group: 
-    - :test
-    version: ">= 0.3.1"
-  jeweler: 
-    group: 
-    - :test
-    version: ">= 0"
-  redgreen: 
-    group: 
-    - :test
-    version: ">= 0"
-specs: 
-- rake: 
-    version: 0.8.7
-- contest: 
-    version: 0.1.2
-- crack: 
-    version: 0.1.7
-- fakeweb: 
-    version: 1.2.8
-- json_pure: 
-    version: 1.2.4
-- gemcutter: 
-    version: 0.5.0
-- git: 
-    version: 1.2.5
-- highline: 
-    version: 1.5.2
-- rubyforge: 
-    version: 2.0.4
-- jeweler: 
-    version: 1.4.0
-- ruby-hmac: 
-    version: 0.4.0
-- oauth: 
-    version: 0.3.6
-- redgreen: 
-    version: 1.2.2
-- vcr: 
-    version: 0.3.1
-- weary: 
-    version: 0.7.2
-hash: 494102bf0992e5bb83118c12065b38b342f1de6a
-sources: 
-- Rubygems: 
-    uri: http://rubygems.org
+PATH
+  remote: .
+  specs:
+    tumblr-rb (2.0.0.alpha)
+      sinatra (~> 1.3.2)
+      thor (~> 0.16.0)
+      weary (~> 1.1.0)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    addressable (2.3.2)
+    crack (0.3.1)
+    diff-lcs (1.1.3)
+    hpricot (0.8.6)
+    multi_json (1.3.6)
+    mustache (0.99.4)
+    promise (0.3.0)
+    rack (1.4.1)
+    rack-protection (1.2.0)
+      rack
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rake (0.9.2.2)
+    rdiscount (1.6.8)
+    ronn (0.7.3)
+      hpricot (>= 0.8.2)
+      mustache (>= 0.7.0)
+      rdiscount (>= 1.5.8)
+    rspec (2.11.0)
+      rspec-core (~> 2.11.0)
+      rspec-expectations (~> 2.11.0)
+      rspec-mocks (~> 2.11.0)
+    rspec-core (2.11.1)
+    rspec-expectations (2.11.3)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.11.3)
+    simple_oauth (0.1.9)
+    sinatra (1.3.3)
+      rack (~> 1.3, >= 1.3.6)
+      rack-protection (~> 1.2)
+      tilt (~> 1.3, >= 1.3.3)
+    thor (0.16.0)
+    tilt (1.3.3)
+    weary (1.1.1)
+      addressable (~> 2.3.2)
+      multi_json (~> 1.3.0)
+      promise (~> 0.3.0)
+      rack (~> 1.4.0)
+      simple_oauth (~> 0.1.5)
+    webmock (1.8.11)
+      addressable (>= 2.2.7)
+      crack (>= 0.1.7)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  jruby-openssl
+  rack-test (~> 0.6.1)
+  rake (~> 0.9.2)
+  ronn
+  rspec (~> 2.11.0)
+  tumblr-rb!
+  webmock (~> 1.8.5)

data/LICENSE

@@ -1,4 +1,6 @@
-Copyright (c) 2010 Mark Wunsch
+Copyright (c) 2010-2012 Mark Wunsch
+
+MIT License
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -17,4 +19,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,33 +1,28 @@
 # tumblr
 
-Ruby wrapper and command line tool for the [Tumblr API](http://www.tumblr.com/docs/en/api). In case there weren't enough of those already. This one is powered by the [Weary](http://github.com/mwunsch/weary) gem.
+Command line interface and Ruby client for the [Tumblr API](http://www.tumblr.com/docs/en/api/v2)
 
-[RDoc](http://rdoc.info/projects/mwunsch/tumblr) | [Gem](http://rubygems.org/gems/tumblr-rb) | [Metrics](http://getcaliper.com/caliper/project?repo=git%3A%2F%2Fgithub.com%2Fmwunsch%2Ftumblr.git)
+It's being rewritten from the ground up to support v2 of the api.
+
+**Check out [tag v1.3.0](https://github.com/mwunsch/tumblr/tree/v1.3.0) if you are interested in v1.** The master branch is now dedicated to v2, and is not in steady state.
+
+Like the previous version, the current version reads files with a special front-matter block, like [Jekyll](http://tom.preston-werner.com/jekyll/). In addition, this new version offers the ability to post photos, videos, and audio.
+
+Unlike the previous version, this new command line utility uses OAuth to authenticate and authorize the user.
+
+## TODO
+
++ Task to build a homebrew formula
 
 ## Installation
 
-	gem install tumblr-rb
-	
-## Usage
-
-	$: tumblr path/to/a_post.markdown
-	Email Address: tumblr-user@foobarmail.com
-	Password:	
-	Published to Tumblr. The ID for this post is: 123456789
-	
-You can pass `tumblr` something from standard input, but you have to set your email and password as arguments:
-
-	$: echo 'Hello world.' | tumblr -a user@tumblr.com:supers3cretp4ssw0rd
-	Published to Tumblr. The ID for this post is: 123456790
-	
-Or the credentials can come from a YAML file:
-
-	$ cat ~/.tumblrlogin
-	email: tumblruser@generic-email.com
-	password: myvoiceismypassport
-	$ echo 'Hello world. | tumblr --credentials ~/.tumblrlogin
-	
-Try `tumblr --help` if you are in need of guidance. Read [tumblr(1)](http://mwunsch.github.com/tumblr/tumblr.1.html) for more information.
+Until the gem is published, you'll just need to clone this repository. Run `bundle install` and `bundle exec bin/tumblr`.
+
+Alternatively, you can clone the repo, and run `rake install` -- this will build the gem, place it in the `pkg` directory, and install the gem to your system. You should then be able to `require 'tumblr'` and/or run `tumblr` from the command line.
+
+## Authorization
+
+Run `tumblr authorize` to boot up a small application to manage the fancy OAuth handshake with tumblr. You'll be prompted for a consumer key and secret you get from [registering an app](http://www.tumblr.com/oauth/apps).
 
 ## Getting Started
 
@@ -42,76 +37,28 @@ YAML frontmatter beings with `---` on a single line, followed by YAML, ending wi
 	tags: hamlet, shakespeare
 	---
 	"To be or not to be."
-	
-Understood YAML parameters are taken from the Tumblr API: http://www.tumblr.com/docs/en/api#api_write
 
-Read [tumblr(5)](http://mwunsch.github.com/tumblr/tumblr.5.html) for more info.
+Understood YAML parameters are taken from the Tumblr API: http://www.tumblr.com/docs/en/api/v2#posting
 
-#### All Posts
+### All Posts
 
-	type				regular, photo, link, quote, conversation, video, audio
+	type				text, photo, link, quote, chat, video, audio
 						will take a guess if ommitted.
-			
-	state				published, queue, draft, submission
-	
+
+	state				published, queue, draft, private
+
 	format				html or markdown
-	
+
 	tags				comma-separated list of tags
-	
+
 	date    			post date
-	
-	private				true if the post is private
-	
+
 	slug				A custom string to appear in the post's URL
-	
-	group				id for a secondary blog
-	
-	generator			description of the publishing application
-	
-	send-to-twitter		Twitter status update if the tumblelog has enabled it
-	
-	publish-on			if the post state is 'queue', publish on this date
-	
-#### Additional parameters for specific Post Types
-
-	regular			title
-	
-	photo			caption, click-through-url
-	
-	quote			source
-	
-	link			name, description
-	
-	conversation	title
-	
-	video			title, caption
-	
-	audio			caption
-	
-To publish to Tumblr, do this:
-
-	request = Tumblr.new(username, password).post(document)
-	request.perform do |response|
-		if response.success?
-			puts response.body 	# Returns the new post's id.
-		else
-			puts "Something went wrong: #{response.code} #{response.message}"
-		end
-	end
-
-## Goals
-
-+ Full API coverage. Leave no method behind.
-+ Well tested. Like a good Rubyist.
-+ Obnoxiously simple CLI. *nix idioms are wonderful.
-+ Kind-of-sort-of proof-of-concept for [Weary](http://github.com/mwunsch/weary).
-
-## TODO:
-
-+ File-uploading for Photos, Videos, Audio (needs to get into Weary)
+
+	tweet				Manages the autotweet (if enabled) for this post
 
 ## Copyright
 
-The Tumblr gem is Copyright (c) 2010 Mark Wunsch and is licensed under the [MIT License](http://creativecommons.org/licenses/MIT/). 
+The Tumblr gem is Copyright (c) 2010 - 2012 Mark Wunsch and is licensed under the [MIT License](http://creativecommons.org/licenses/MIT/).
 
 Tumblr is Copyright (c) Tumblr, Inc. The Tumblr gem is NOT affiliated with Tumblr, Inc.

data/Rakefile

@@ -1,79 +1,19 @@
-begin
-  # Try to require the preresolved locked set of gems.
-  require File.expand_path('../.bundle/environment', __FILE__)
-rescue LoadError
-  # Fall back on doing an unlocked resolve at runtime.
-  require "rubygems"
-  require "bundler"
-  Bundler.setup
-end
-$LOAD_PATH.unshift File.join(File.dirname(__FILE__), 'lib')
-require 'tumblr'
-require 'rake'
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "tumblr-rb"
-    gem.summary = "Ruby wrapper and command line interface to the Tumblr API."
-    gem.description = "Ruby library and command line utility to work with the Tumblr Blogging Platform, powered by Weary."
-    gem.version = Tumblr::VERSION
-    gem.email = "mark@markwunsch.com"
-    gem.homepage = "http://github.com/mwunsch/tumblr"
-    gem.authors = ["Mark Wunsch"]
-    gem.add_dependency 'weary', '>= 0.7.1'
-    gem.add_dependency 'highline', '>= 1.5.2'
-    gem.add_development_dependency "bundler", ">= 0.9.19"
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
-
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-end
-
-begin
-  require 'rcov/rcovtask'
-  Rcov::RcovTask.new do |test|
-    test.libs << 'test'
-    test.pattern = 'test/**/test_*.rb'
-    test.verbose = true
-  end
-rescue LoadError
-  task :rcov do
-    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
-  end
-end
-
-task :default => :test
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
+#!/usr/bin/env rake
+require "bundler/gem_tasks"
+require 'rspec/core/rake_task'
 
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "tumblr #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
+task :default => :spec
 
-desc "Open an irb session preloaded with this library"
-task :console do
-  sh "irb -rubygems -I lib -r tumblr"
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.rspec_opts = ["--color", "--format=documentation"]
 end
 
 desc "Build the manual"
 task :build_man do
   sh "ronn -br5 --organization='Mark Wunsch' --manual='Tumblr Manual' man/*.ronn"
 end
- 
+
 desc "Show the manual"
 task :man => :build_man do
   exec "man man/tumblr.1"
-end
+end

data/bin/tumblr

@@ -1,135 +1,5 @@
 #!/usr/bin/env ruby
-## Tumblr is a command line interface for publishing to Tumblr.com
-##
-## Usage: tumblr [ OPTIONS ] [ FILE or URL ]
-## 
-## Publish to Tumblr. If a URL is given, it will create a link post.
-## If URL is a YouTube or Vimeo URL, it will create a video post. 
-## If a FILE is given, it will publish its contents. 
-## See tumblr(5) for formatting instructions for FILE.
-## If a URL or FILE is not given, tumblr will read from the Standard Input.
-## If tumblr reads from the Standard Input, you must authenticate with -a.
-##
-##
+require File.expand_path File.join(File.dirname(__FILE__), "/../lib/tumblr")
+require 'tumblr/command_line_interface'
 
-require 'optparse'
-
-def usage
-  File.readlines(__FILE__).
-  grep(/^##.*/).
-  map { |line| line.chomp[3..-1] }.
-  join("\n")
-end
-
-begin
-  require 'tumblr'
-rescue LoadError
-  raise if $!.to_s !~ /tumblr/
-  libdir = File.expand_path("../../lib", __FILE__).sub(/^#{Dir.pwd}/, '.')
-  if !$:.include?(libdir)
-    $:.unshift libdir
-    require File.expand_path('../../.bundle/environment', __FILE__)
-    retry
-  end
-  raise
-end
-
-publisher = {}
-publish_state = nil
-group = nil
-
-ARGV.options do |option|
-  option.banner = usage
-  option.separator "Options"
-  
-  auth_text = 'Email Address and Password, separated by a colon'
-  option.on('-a EMAIL:PASSWORD', '--auth EMAIL:PASSWORD', auth_text) do |auth|
-    publisher[:email],publisher[:password] = auth.split(':')
-  end
-  
-  address_text = 'Email Address (will prompt for password)'
-  option.on('-e EMAIL', '--email EMAIL', address_text) do |email| 
-    publisher[:email] = email
-  end
-  
-  option.on('--credentials FILE', 'A YAML file with "email" and "password" keys for authentication') do |file|
-    credentials = YAML.load(File.read(file))
-    publisher[:email] = credentials['email']
-    publisher[:password] = credentials['password']
-  end
-  
-  option.on('-p','--publish', 'Publish the post immediately (ignores "state" parameter)') { publish_state = :published }
-  option.on('-q','--queue', 'Add the post to the queue') { publish_state = :queue }
-  option.on('-d','--draft', 'Save the post as a draft') { publish_state = :draft }
-  
-  option.on('--group=GROUP','Publish to a group blog') {|value| group = value }
-    
-  option.separator ""
-  
-  option.on('-h','--help', 'Show this help message') { puts option ; exit }
-  option.on('-v','--version', 'Show version number') do 
-    puts Tumblr::VERSION
-    exit
-  end
-  
-  option.separator ""  
-  
-  option.parse!
-end
-
-if ARGV.empty? && STDIN.tty?
-  puts usage
-  puts "See 'tumblr --help' for more information."
-  exit
-end
-  
-input = if !ARGV.empty?
-  path = ARGV.first
-  (path =~ /^https?:\/\/\S+$/i) ? path : File.read(path)
-else
-  STDIN.read.chomp!
-end
-
-if !STDIN.tty? && (!publisher[:email] || !publisher[:password])
-  bad_auth = %q(Error: An email address and password are required. Use 'tumblr -a' to authenticate. See 'tumblr --help' for details.)
-  abort bad_auth
-end
-
-if !publisher[:email] || !publisher[:password]
-  begin
-    require 'highline/import'
-  rescue LoadError
-    require 'rubygems'
-    retry
-  end
-  
-  def get_email(pub)
-    pub[:email] = ask("Email Address:  ")
-    get_email(pub) if pub[:email].empty?
-  end
-
-  def get_password(pub)
-    pub[:password] = ask("Password:  ") { |q| q.echo = false }
-    get_password(pub) if pub[:password].empty?
-  end  
-    
-  if !publisher[:email]
-    get_email(publisher)
-  end
-
-  if !publisher[:password]
-    get_password(publisher)
-  end
-end
-
-post = Tumblr.parse(input)
-post.state = publish_state if publish_state
-post.group = group if group
-
-response = Tumblr.execute(publisher, post)
-if response.success?
-  puts "Published to Tumblr. The ID for this post is: #{response.body}"
-  exit
-else
-  abort %Q(Oh no! Something went wrong. Tumblr says, "#{response.body}")
-end
+Tumblr::CommandLineInterface.start