batchtapaper 1.0.0 → 1.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 129911756a75e4e94c28fd70553e5279609fd0a6
+  data.tar.gz: 2bae666e6c96eb1632dcd7b23e8fec696e4f1b18
+SHA512:
+  metadata.gz: 5a09b32b3dab434ec03d469e4f10637fc6a4e7ec4bf79a665747f3e89962b52b9fc23641ed54c1d6f786e859282a4e23ad17c211169551520c3717d81a760ebb
+  data.tar.gz: eb81ddf220e61063e2ecd96a49dbf24e999516ea485f20df4d0505b3fdb7d826a29b24cf1627bf7f5afdda8f07148c2e51101ea6f472454ed3b15a4f8c391760

data/bin/batchtapaper

@@ -1,102 +1,22 @@
 #!/usr/bin/env ruby
 
-require "net/http"
-require "net/https"
-require "uri"
-
-API_URL = URI.parse("https://www.instapaper.com/api/add")
+require "bundler/setup"
+require "batchtapaper"
+require "faraday"
 
 # Fetch our URLs; either from the files given in the arguments, or from
 # STDIN.
 lines = ARGF.read
 
-unless lines
-	puts "No URLs specified."
-	exit
-end
-
-lines = lines.split("\n")
-
-# First, attempt to read usernames and passwords from the
-# ~/.instapaperrc file.
-rcfile = File.expand_path("~/.instapaperrc")
-if File.exists? rcfile
-	username, password = IO.read(rcfile).split("\n")
-end
-
-if !username && !STDIN.tty?
-	# If we haven't got a username from the rc file, and we're reading input
-	# from STDIN, then we're out of luck; we can't proceed.
-	puts "When passing URLs via STDIN, you must have an ~/.instapaperrc file containing your auth details."
-	exit
-elsif !username && STDIN.tty?
-	# If we do have a TTY (if the URLs are in a file), then we can prompt
-	# the user for their auth details.
-	begin
-		print "Email or username: "
-		username = STDIN.gets.chomp
-
-		print "Password (if you have one): "
-		# We don't want to echo input when the user is entering their
-		# password, to prevent shoulder surfing; so, we disable the
-		# terminal's echo temporarily.
-		system 'stty -echo'
-		password = STDIN.gets.chomp
-		system 'stty echo'
-	rescue NoMethodError, Interrupt
-		# In case the user interrupts when typing their password, we don't
-		# want to leave them with a terminal that isn't echoing.
-		system 'stty echo'
-		exit
-	end
-
-	puts "\n\n"
-end
-
-# Grab the lines of the file
-lines.each do |line|
-	line.strip!
-
-	# If the line contains a tab, then assume it's in "URL[tab]title" format
-	if line =~ /\t/
-		url, title = line.split("\t")
-	else
-		url = line
-	end
-
-	# Attempt to parse the URL that we've been given.
-	begin
-		url = URI.parse(url)
-	rescue
-		puts "#{url} doesn't seem to be a valid URL. Moving on..."
-		continue
-	end
-
-	print "Processing URL: #{url}..."
-
-	post = { 'username' => username, 'password' => password, 'url' => url.to_s }
-	if title
-		post['title'] = title
-	end
-
-	# We need to use this slightly more verbose syntax, rather than just
-	# Net::HTTP::post_form, because the Instapaper API uses SSL.
-	request = Net::HTTP::Post.new(API_URL.path)
-	request.set_form_data(post)
-
-	sock = Net::HTTP.new(API_URL.host, API_URL.port)
-	sock.use_ssl = true
-	response = sock.start { |http| http.request(request) }
-
-	# The Instapaper API will return a 403 error for any request if the
-	# given username and password are wrong.
-	if response.code == 403
-		puts "Username/password incorrect."
-		exit
-	end
-	
-	# We can fairly reasonably assume that any other request is valid.
-	print " Got response #{response.code}\n"
-
-	sleep 1
+begin
+  batchtapaper = Batchtapaper.from_string(lines)
+  batchtapaper.process do |request|
+    if request.successful?
+      puts "Successfully added #{request.url} (#{request.title})."
+    else
+      puts "Failed to add #{request.url}."
+    end
+  end
+rescue Batchtapaper::NoAuthError => e
+  $stderr.puts e.message
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: batchtapaper
 version: !ruby/object:Gem::Version
-  version: 1.0.0
-  prerelease: 
+  version: 1.1.0
 platform: ruby
 authors:
 - Rob Miller
@@ -10,7 +9,35 @@ autorequire:
 bindir: bin
 cert_chain: []
 date: 2013-03-19 00:00:00.000000000 Z
-dependencies: []
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: faraday
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.8'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
 description: Easily add multiple URLs to Instapaper, either from a file or from STDIN.
 email: rob@bigfish.co.uk
 executables:
@@ -21,26 +48,26 @@ files:
 - bin/batchtapaper
 homepage: https://github.com/robmiller/batchtapaper
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Bulk-add URLs to Instapaper
 test_files: []
+has_rdoc: