pinup 0.1.0 → 0.1.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NmE3YzhkNTM1NjZiY2E4OWUxOTI2M2NmYzI1ZjE1N2M5ZGVhOTk5OQ==
+    NTkzZDNhMzg3MDFhNGMxZTI5NmY4MGEwMGE0OGNlOGJkNTIyODBhNg==
   data.tar.gz: !binary |-
-    YzA2MzQxNjBiNmE1OWM5YjIwZDM3ZWFlMjZjMDViODAwOTkxOGM5Mw==
+    NzVmYTUxZjJlY2E2MDlmN2MzYTg4ZGI3YzhjMDgzMmQyOTEzNDUyMA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    Y2Q3ODFlNTAxNzk3NGQ2MzUwNDRhNjU3ZTAyMzFkYzE4OGJlZTMyNTdiZTky
-    Nzc3ZTE3Y2JmZWFjNzMxYzEwNTI2NGY0ZDlhNWE5ODVhYmVjMzBmMWU0YTYx
-    ZmQ3NjEyZTg4ZWVmMmQyYmMzYWRmMDZiMThmM2M5NTFkMWI2MGQ=
+    YjQyMGUyNmEyYzY5N2I3NGJjNmUzZDY2OWZhNjUzZDBhNGFkMmY4YWE5NTVj
+    OGI3NDNlOGI3YWQ4NDU0MzAwYjk4MjEwOGI1OWM5ZDg2ODIyYzM5YmRlZmMz
+    YThhZTUzNWE4MTA4OTgwMjhmNmJhYWNkMTBjN2VkMmVjODQ0ZjQ=
   data.tar.gz: !binary |-
-    OWY4NDNmOWMzZDBkYjY3ZjE3YjY3MzdlNDdjODJjNzgzMjlmYTdkYzYxOWZk
-    YmMxZTE4NDZjM2E0N2IzZDZhNTU3MzE1ZDJhNmE4ZTI2OTc0OGE4ODAzMTc1
-    MWM3ZjY0ZDRlYzc3MTFiOTFmYzVhNmE5MWQ5ZTA1OTVhN2IyOTY=
+    YTkwMjlkMDY2ZDMxNTgyMTM0ZTE2ZDg4MThmMDhlMjBiNjYwZWVhOWQyOGQ5
+    MzIyNWU4ZTVjZjdhM2MzNmUxOTZjOWYwMmMxZjUxZGQ2MTI0ZjAwYWMzMzQx
+    NGQ0ZmQ0MDQ3M2NiMWM4NWE4MDg5ZjhmMWVlODI3MjEyNjM0MjQ=

data/README.md

@@ -3,6 +3,8 @@
 Pinup is a [RubyGem](http://rubygems.org/) for quickly getting through your [Pinboard](https://pinboard.in) bookmarks. It allows you to open or list your bookmarks and delete them afterwards (if you'd like).
 
 [![Build Status](https://travis-ci.org/Keithbsmiley/pinup.png?branch=master)](https://travis-ci.org/Keithbsmiley/pinup)
+[![Code Climate](https://codeclimate.com/github/Keithbsmiley/pinup.png)](https://codeclimate.com/github/Keithbsmiley/pinup)
+[![Coverage Status](https://coveralls.io/repos/Keithbsmiley/pinup/badge.png?branch=master)](https://coveralls.io/r/Keithbsmiley/pinup)
 [![Dependency Status](https://gemnasium.com/Keithbsmiley/pinup.png)](https://gemnasium.com/Keithbsmiley/pinup)
 
 ## Authorization

data/Rakefile

@@ -3,7 +3,7 @@ require 'rspec/core/rake_task'
 
 # NOTE CI does not run all tests, some tests require valid Pinboard credentials in the netrc file
 RSpec::Core::RakeTask.new do |t|
-  t.pattern = FileList['spec/**/*.rb'].exclude(/authorize|queries/)
+  t.pattern = FileList['spec/**/*.rb'].exclude(/authorize|command|queries/)
 end
 
 task :default => :spec

data/lib/pinup/commands/authorize.rb

@@ -17,9 +17,7 @@ module Pinup
 
     def self.authorize_netrc(options = {})
       path = DEFAULT_NETRC
-      if options[:path]
-        path = File.expand_path(options[:path])
-      end
+      path = File.expand_path(options[:path]) if options[:path]
 
       netrc = Netrc.read(path)
       username, password = netrc[PINBOARD_URL]
@@ -40,10 +38,11 @@ module Pinup
       parameters[:auth_token] = token
       response = authorize({ params: parameters })
 
-      if response.code != '200'
-        puts "Invalid user credentials in #{ path }".red
+      if !valid_credentials(response.code)
         return nil
-      elsif !path.nil? && DEFAULT_NETRC != path
+      end
+
+      if path && DEFAULT_NETRC != path
         Pinup::Settings.write_settings({ path: path })
       else
         Pinup::Settings.clear_settings
@@ -55,21 +54,17 @@ module Pinup
     def self.authorize_credentials(options = {})
       # Ask for user and pass, save to passed or default netrc location
       # Reading from options hash for testing
-      username = options[:username] || ask('Enter your username')
+      print 'Enter your username: ' if options[:username].nil?
+      username = options[:username] || gets.chomp
       print 'Enter your password (not saved): ' if options[:password].nil?
       password = options[:password] || STDIN.noecho(&:gets).chomp
 
       parameters = { params: JSON_PARAMS.dup, username: username, password: password }
       response = authorize(parameters)
 
-      if response.code != '200'
-        puts 'Invalid user credentials'.red
-        return nil
-      else
+      if valid_credentials(response.code)
         path = DEFAULT_NETRC
-        if options[:path]
-          path = File.expand_path(options[:path])
-        end
+        path = File.expand_path(options[:path]) if options[:path]
 
         json   = JSON.parse(response.body)
         digits = json['result']
@@ -81,20 +76,17 @@ module Pinup
         Pinup::Settings.save_token(options)
 
         return true
+      else
+        return nil
       end
     end
 
-    def self.ask(string)
-      print "#{ string }: "
-      gets.chomp
-    end
-
     private
 
       def self.authorize(options = {})
-        parameters = options[:params]   || {}
-        username   = options[:username] || {}
-        password   = options[:password] || {}
+        parameters = options[:params] || {}
+        username   = options[:username]
+        password   = options[:password]
 
         uri = URI.parse("#{ API_URL }/user/api_token")
         uri.query = URI.encode_www_form(parameters)
@@ -104,11 +96,20 @@ module Pinup
         http.verify_mode = OpenSSL::SSL::VERIFY_NONE
 
         request = Net::HTTP::Get.new(uri.request_uri)
-        if !username.nil? && !username.empty? && !password.nil? && !password.empty?
+        if username && password
           request.basic_auth(username, password)
         end
 
         http.request(request)
       end
+
+      def self.valid_credentials(code)
+        if code == '200' || code == 200
+          return true
+        end
+
+        puts 'Invalid user credentials'.red
+        return false
+      end
   end
 end

data/lib/pinup/commands/list.rb

@@ -1,10 +1,10 @@
 module Pinup
   class List
     def self.list_pins(options = {})
-      unread   = options[:unread]      unless options[:unread].nil?
-      untagged = options[:untagged]    unless options[:untagged].nil?
-      count    = options[:number].to_i unless options[:number].nil?
-      delete   = options[:delete]      unless options[:delete].nil?
+      unread   = options[:unread]
+      untagged = options[:untagged]
+      count    = options[:number].to_i
+      delete   = options[:delete]
 
       items        = Pinup::Queries.list_items
       filtered     = Pinup::Queries.filter_items(items, unread, untagged, count)

data/lib/pinup/commands/open.rb

@@ -3,18 +3,22 @@ require 'launchy'
 module Pinup
   class Open
     def self.open_pins(options = {})
-      unread   = options[:unread]      unless options[:unread].nil?
-      untagged = options[:untagged]    unless options[:untagged].nil?
-      count    = options[:number].to_i unless options[:number].nil?
-      delete   = options[:delete]      unless options[:delete].nil?
+      unread   = options[:unread]
+      untagged = options[:untagged]
+      count    = options[:number].to_i
+      delete   = options[:delete]
 
       items        = Pinup::Queries.list_items
       filtered     = Pinup::Queries.filter_items(items, unread, untagged, count)
       items_string = Pinup::Queries.item_string(filtered)
       urls         = items_string.split(/\n/)
 
-      urls.each do |url|
-        Launchy.open(url)
+      if count > 0 # For testing
+        urls.each do |url|
+          Launchy.open(url)
+        end
+      else
+        puts "You must specify more than #{ count } items"
       end
 
       if delete

data/lib/pinup/queries.rb

@@ -13,7 +13,7 @@ module Pinup
       parameters = JSON_PARAMS.dup
       parameters[:auth_token] = token
 
-      response = list_query(parameters)
+      response = pinboard_query(LIST_PATH, parameters)
       if response.code != '200'
         puts "Error getting bookmarks: #{ response.body }"
         return nil
@@ -36,22 +36,8 @@ module Pinup
       json.each do |item|
         bookmark = Bookmark.new(item)
 
-        if unread && untagged
-          if bookmark.unread || bookmark.untagged
-            new_items << bookmark
-          end
-        elsif unread
-          if bookmark.unread && !bookmark.untagged
-            new_items << bookmark
-          end
-        elsif untagged
-          if bookmark.untagged && !bookmark.unread
-            new_items << bookmark
-          end
-        else
-          if !bookmark.unread && !bookmark.untagged
-            new_items << bookmark
-          end
+        if should_show(bookmark, unread, untagged)
+          new_items << bookmark
         end
 
         if new_items.count >= count
@@ -74,10 +60,33 @@ module Pinup
       urls.each do |url|
         url_params = parameters.dup
         url_params[:url] = url
+        pinboard_query(DELETE_PATH, url_params)
         delete_query(url_params)
       end
     end
 
+    def self.should_show(bookmark, unread, untagged)
+      if unread && untagged
+        if bookmark.unread || bookmark.untagged
+          return true
+        end
+      elsif unread
+        if bookmark.unread && !bookmark.untagged
+          return true
+        end
+      elsif untagged
+        if bookmark.untagged && !bookmark.unread
+          return true
+        end
+      else
+        if !bookmark.unread && !bookmark.untagged
+          return true
+        end
+      end
+
+      return false
+    end
+
     def self.item_string(items)
       item_output = ""
       items.each do |item|
@@ -88,21 +97,9 @@ module Pinup
     end
 
     private
-      
-      def self.list_query(parameters)
-        uri = URI.parse("#{ API_URL }/posts/all")
-        uri.query = URI.encode_www_form(parameters)
-
-        http = Net::HTTP.new(uri.host, uri.port)
-        http.use_ssl = true
-        http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-
-        request = Net::HTTP::Get.new(uri.request_uri)
-        http.request(request)
-      end
 
-      def self.delete_query(parameters)
-        uri = URI.parse("#{ API_URL }/posts/delete")
+      def self.pinboard_query(path, parameters)
+        uri = URI.parse("#{ API_URL }/#{ path }")
         uri.query = URI.encode_www_form(parameters)
 
         http = Net::HTTP.new(uri.host, uri.port)

data/lib/pinup/settings.rb

@@ -11,11 +11,11 @@ module Pinup
     end
 
     def self.read_settings
-      if !File.exists? SETTINGS
-        return nil
+      settings = nil
+      if File.exists?(SETTINGS)
+        settings = YAML::load_file(SETTINGS)
       end
 
-      settings = YAML::load_file(SETTINGS)
       if !settings || settings.empty?
         return nil
       end
@@ -46,7 +46,7 @@ module Pinup
       password = token_split.last
       
       netrc = Netrc.read(path)
-      netrc.new_item_prefix = "\n# This Entry was added automatically\n"
+      netrc.new_item_prefix = "\n\n# This Entry was added automatically\n"
       netrc[PINBOARD_URL] = username, password
       netrc.save
 

data/lib/pinup/version.rb

@@ -1,8 +1,10 @@
 module Pinup
-  VERSION       = '0.1.0'
+  VERSION       = '0.1.1'
   SETTINGS      = File.expand_path('~/.pinup')
   PINBOARD_URL  = 'pinboard.in'
   API_URL       = 'https://api.pinboard.in/v1'
   JSON_PARAMS   = { format: 'json' }
   DEFAULT_NETRC = File.expand_path('~/.netrc')
+  DELETE_PATH   = 'posts/delete'
+  LIST_PATH     = 'posts/all'
 end

data/pinup.gemspec

@@ -19,6 +19,7 @@ spec = Gem::Specification.new do |s|
   s.add_dependency('netrc', '~> 0.7.7')
   s.add_dependency('launchy', '~> 2.3.0')
   s.add_development_dependency('rake')
+  s.add_development_dependency('coveralls')
   s.add_development_dependency('rspec', '~> 2.13.0')
   s.add_runtime_dependency('gli','2.5.6')
 end

data/spec/integration/authorize_spec.rb

@@ -2,7 +2,25 @@ require_relative '../spec_helper'
 
 describe Pinup::Authorize do
   before do
-    @netrc_path = File.expand_path('~/foobar')
+    @netrc_path = File.expand_path('~/foobarbaz')
+  end
+
+  describe 'authorize_command' do
+    describe 'when netrc is true' do
+      it 'should call the correct method' do
+        options = { netrc: true }
+        Pinup::Authorize.should_receive(:authorize_netrc)
+        Pinup::Authorize.authorize_command(options)
+      end
+    end
+
+    describe 'when netrc is false' do
+      it 'should call the correct method' do
+        options = { netrc: false }
+        Pinup::Authorize.should_receive(:authorize_credentials)
+        Pinup::Authorize.authorize_command(options)
+      end
+    end
   end
 
   describe 'authorize_netrc' do
@@ -18,6 +36,43 @@ describe Pinup::Authorize do
         expect(Pinup::Authorize.authorize_netrc).to be_true
       end
     end
+
+    describe 'invalid credentials' do
+      before do
+        @path = File.expand_path('~/foobar') 
+        Pinup::Settings.write_settings({ path: @path })
+      end
+
+      after do
+        File.delete(@path) if File.exists?(@path)
+        Pinup::Settings.clear_settings
+      end
+
+      describe 'invalid token' do
+        before do
+          Pinup::Settings.save_token({ token: 'foo:bar', path: @path })
+        end
+
+        it 'should return nil' do
+          expect(Pinup::Authorize.authorize_netrc({ path: @path })).to be_nil
+        end
+      end
+    end
+    
+    describe 'valid credentials with custom path' do
+      before do
+        token = Pinup::Settings.get_token
+        @path = File.expand_path('~/foobar') 
+        Pinup::Settings.save_token({ token: token, path: @path })
+      end
+
+      it 'should write the settings' do
+        Pinup::Authorize.authorize_netrc({ path: @path })
+        settings = Pinup::Settings.read_settings
+        result = settings[:path] == @path
+        expect(result).to be_true
+      end
+    end
   end
 
   describe 'authorize_credentials' do

data/spec/integration/commands_spec.rb

@@ -0,0 +1,29 @@
+require_relative '../spec_helper'
+
+describe Pinup::List do
+  describe 'cli usage' do
+    before do
+      Pinup::List.list_pins
+      @response = %x[bundle exec bin/pinup list]
+    end
+
+    it 'should print some URLs' do
+      expect(@response).to match(/http/)
+      expect(@response).to match(/com/)
+    end
+  end
+end
+
+describe Pinup::Open do
+  describe 'cli usage' do
+    before do
+      Pinup::Open.open_pins({ number: 0 })
+      @output = %x[bundle exec bin/pinup open -n 0]
+    end
+
+    it 'should get called from the open command' do
+      expect(@output).to match(/0/)
+      expect(@output).to match(/specify/)
+    end
+  end
+end

data/spec/integration/queries_spec.rb

@@ -7,10 +7,38 @@ describe Pinup::Queries do
       @posts = JSON.parse(items)
     end
 
-    it 'shoud return some number of items' do
+    it 'should return some number of items' do
       result = @posts.count > 0
       expect(result).to be_true
     end
+
+    describe 'token issues' do
+      before(:each) do
+        @path = File.expand_path('~/foobar') 
+        Pinup::Settings.write_settings({ path: @path })
+      end
+
+      after(:each) do
+        File.delete(@path) if File.exists?(@path)
+        Pinup::Settings.clear_settings
+      end
+
+      describe 'no token' do
+        it 'should return nil' do
+          expect(Pinup::Queries.list_items).to be_nil
+        end
+      end
+
+      describe 'invalid token' do
+        before do
+          Pinup::Settings.save_token({ token: 'foo:bar', path: @path })
+        end
+
+        it 'should return nil' do
+          expect(Pinup::Queries.list_items).to be_nil
+        end
+      end
+    end
   end
 
   describe 'filter_items' do
@@ -113,6 +141,16 @@ describe Pinup::Queries do
         end
       end
     end
+
+    describe 'improper JSON' do
+      it 'should exit' do
+        begin
+          Pinup::Queries.filter_items('foobar', true, true, 10)
+        rescue SystemExit => e
+          expect(e).not_to be_nil
+        end
+      end
+    end
   end
 
   describe 'item_string' do

data/spec/integration/settings_spec.rb

@@ -112,10 +112,14 @@ describe Pinup::Settings do
 
     describe 'if there is no token' do
       before do
-        @local_path = File.expand_path('~/foobar')
+        @local_path = File.expand_path('~/foobarquux')
         Pinup::Settings.write_settings({ path: @local_path })
       end
 
+      after do
+        File.delete(@local_path) if File.exists?(@local_path)
+      end
+
       it 'should return nil' do
         token = Pinup::Settings.get_token
         expect(token).to be_nil

data/spec/spec_helper.rb

@@ -6,6 +6,11 @@
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 #
 
+if ENV['COVERALLS_RUN_LOCALLY']
+  require 'coveralls'
+  Coveralls.wear!
+end
+
 require 'pinup'
 require 'pinup/version.rb'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pinup
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Keith Smiley
@@ -66,6 +66,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -120,6 +134,7 @@ files:
 - pinup.gemspec
 - spec/integration/authorize_spec.rb
 - spec/integration/bookmark_spec.rb
+- spec/integration/commands_spec.rb
 - spec/integration/queries_spec.rb
 - spec/integration/settings_spec.rb
 - spec/spec_helper.rb
@@ -150,6 +165,7 @@ summary: Digest your Pinboard bookmarks in bulk
 test_files:
 - spec/integration/authorize_spec.rb
 - spec/integration/bookmark_spec.rb
+- spec/integration/commands_spec.rb
 - spec/integration/queries_spec.rb
 - spec/integration/settings_spec.rb
 - spec/spec_helper.rb