wp2tumblr 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa3cb0fc81507ba8122d6dfdfe7092fda46be2b5
-  data.tar.gz: dc2c48808a149bd84ca16020207fb833c2a96650
+  metadata.gz: 1b4b19027d615019e3b447a34005f0e265479f6d
+  data.tar.gz: 24b148146d1591997d7d0afe6bff14ba003b9fab
 SHA512:
-  metadata.gz: 88090ceaa17c302081022e2ed2b538f087a1558393fbf34548f7077ef3ce52cc13ac8894a8dd5654e22c4f5a79df5a6f115a1ec545a9de527a9125fe7266be76
-  data.tar.gz: e352f6afa69a041df9645b52da2f492ca9d6a5a54e5c2a7f6a8aba6928e4e0e29a29826550ca16b7184610b5e82cdee15b0049fc180a292f168fc792d8421556
+  metadata.gz: 3a26638e5161ef6a05c76c78e3cc37353996bc93402bd4f7f724d3b7bc9fd4c4243b38e35ae3af49e0a749f242bcdfc115dcaed00f07fd17dcf62fdb823532f9
+  data.tar.gz: 80d857c15f2665fc3c4e013ec41174ede4b8251b5609dd0e1089a99fd7b95bf62286ba80337287229f3868eaaa45df317ab9ba1a085a19f71f356a5b29723cf9

data/README.md

@@ -7,7 +7,20 @@ A CLI tool to import wordpress xml files into Tumblr via the Tumblr api
     $ gem install wp2tumblr
 
 ## Usage
-This gem is dependant on the `~/.tumblr` config file that the [tumblr_client gem](https://github.com/tumblr/tumblr_client) generates. If you have not previously installed the [tumblr_client gem](https://github.com/tumblr/tumblr_client) and have run the [irb console setup](https://github.com/tumblr/tumblr_client#the-irb-console) you will be prompted to do so upon first use of this gem.
+
+#### Config 
+Before you will be able to import your posts into Tumblr you will need to configure your Tumblr API credentials.
+
+    $ wp2tumblr config
+
+You will be asked to register your application, provide your application's secret and public keys, and obtain an oauth_verifier token.
+
+### Server
+`wp2tumblr` includes a small Sinatra server to aid in collecting your oauth_verifier token. When you rigister your application just give it the callback url `http://localhost:9292/callback`, open up a seprate terminal window or session and run:
+
+    $ wp2tumblr server
+
+Now when you visit the redirect url your are given from `wp2tumblr config` you will see the oauth_verifier in your console.
 
 ### Import
 Once you have completed the config process simply run the following command:
@@ -22,22 +35,8 @@ The `-f` option is the absolute path to your wordpress export file, ex. `~/Downl
 
 `wp2tumblr` will sleep one second between each post to not overload the Tumblr api. You will also see feedback stating how many posts were parsed from the wordpress export file as well as the title of each post that is currently being submitted to the Tumblr api.
 
-## Configuration Tips
-
-If you're starting completely from scratch with Tumblr here is a basic outline of the steps to take after you have installed this gem.
-
-#### Register an Application with Tumblr
-go to [Tumblr Apps](http://www.tumblr.com/oauth/apps), create your application and take note of your OAuth Consumer Key as well as your Consumer Secret Key. You will need to register a callback url to get your `oauth_verifier` token, I created a [Sinatra](https://github.com/sinatra/sinatra) app for this at `http://localhost:4567/callback`.
-
-#### Configure the Tumblr Client
-Once you have your application token's run:
-  
-    $ tumblr
-
-You will be prompted to enter your OAuth Consumer key, then your OAuth Consumer Secret. The [tumblr_client gem]('https://github.com/tumblr/tumblr_client') will then output an authorize url, copy and paste that into your browser and your callback url will receive the `oauth_verifier` post containing the OAuth Verifier token.
-
-
 ## Changelog
+- **Version 0.1.1:** Refactored config process
 - **Version 0.1.0:** Minor Feature, added Base64 encoding of images
 - **Version 0.0.1:** Initial Release
 

data/bin/wp2tumblr

@@ -14,6 +14,7 @@ opt_parser = OptionParser.new do |opt|
   opt.separator "Commands"
   opt.separator "    text: upload posts as type 'text'"
   opt.separator "    config: configure your Tumblr API credentials"
+  opt.separator "    server: start up a sinatra server to capture the oauth_verifier"
   opt.separator ""
   opt.separator "Options"
 
@@ -32,6 +33,11 @@ puts opt_parser unless ARGV[0]
 
 tumblr_config_path = File.join ENV['HOME'], '.wp2tumblr'
 
+if ARGV[0] === "server"
+  puts "starting sinatra server, register 'http://localhost:9292/callback' as your apps' callback url."
+  system("rackup -Ilib #{File.join File.dirname(__FILE__), "..", "lib", "server"}/config.ru")
+end
+
 if ARGV[0] === "config"
   api_config = {}
   puts "Register an application at: #{site}/oauth/apps" 

data/lib/server/config.ru

@@ -0,0 +1,3 @@
+$:.unshift File.expand_path("../", __FILE__)
+require "#{File.join File.dirname(__FILE__)}/sinatra_server"
+run Sinatra::Application

data/lib/server/sinatra_server.rb

@@ -0,0 +1,5 @@
+require "sinatra"
+
+get "/callback" do
+  puts "Your oauth_verifier token: #{params[:oauth_verifier]}"
+end

data/lib/wp2tumblr/version.rb

@@ -1,3 +1,3 @@
 module Wp2tumblr
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/wp2tumblr.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "oauth"
   spec.add_dependency "tumblr_client"
   spec.add_dependency "nokogiri"
+  spec.add_dependency "sinatra"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wp2tumblr
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - jonlunsford
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-26 00:00:00.000000000 Z
+date: 2013-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth
@@ -52,6 +52,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  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'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -137,6 +151,8 @@ files:
 - README.md
 - Rakefile
 - bin/wp2tumblr
+- lib/server/config.ru
+- lib/server/sinatra_server.rb
 - lib/wp2tumblr.rb
 - lib/wp2tumblr/config.rb
 - lib/wp2tumblr/tumblr_client.rb