feed2email 0.10.0 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dbcdf4e12f0075c8ecdb50cbbf4e4fdb9fef1959
-  data.tar.gz: f47dae1909bc87274d37eade561c68caa6e5f8b9
+  metadata.gz: 800140876c0e1dc7bbde32a7571181b9580f6f2a
+  data.tar.gz: 5ae7e9f92dd34d65894d8a409e98c63435f821fd
 SHA512:
-  metadata.gz: 8e7c27a67e616639c4e1bc9957e6b0189e7f7aaf9f5f55ad7f6f351196852671fa2c6690d0e30a797fcd02aead4adcc6ba0ab210748b4925451d4852f9468d3b
-  data.tar.gz: d063673ffa118876f8e9ec1d5728ec4be95c6688539320868fd96f0f43b274dc51c12ca2edf97466404ebabeb3838fa2262bce4dd53b3ee711d2129140dbdfea
+  metadata.gz: 617440511f7ec5740acaedb65e45b3759d65c265514d529619ef2eb673e9f699163bde5226f0ca6b8b8d5d83a8df85cb137e39d09aeb95d6c665b956bfecd29b
+  data.tar.gz: 27f2c0d7ae508421b1f9ebbbf853057256fe20c2bc9a708395ea4cb97f504d2e839759ce55b89ffb66ad0871f27935785e8debc4bab308a6d21bb68c412e135e

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+### 0.11.1
+
+* New release to ship a properly-built gem file. Release 0.11.0 was missing the
+  binaries.
+
+### 0.11.0 (yanked)
+
+* Add `--remove` option to `import` command for feed list synchronization
+* Change and limit command-line confirmation responses from `yes`/`no` to
+  `y`/`n`
+* Show number of enabled feeds in list command
+
 ### 0.10.0
 
 * Do not strip `nil` entry title to prevent exceptions

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) 2013, 2014, 2015 Aggelos Orfanakos
+Copyright (c) 2013, 2014, 2015 Angelos Orfanakos
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

data/README.md

@@ -151,17 +151,17 @@ feeds in that page:
 ~~~ sh
 $ f2e add http://www.rubyinside.com/
 0: http://www.rubyinside.com/feed/ "Ruby Inside" (application/rss+xml)
-Please enter a feed to subscribe to: 0
+Please enter a feed to subscribe to (or Ctrl-C to abort): [0] 0
 Added feed:   3 http://www.rubyinside.com/feed/
 $ f2e add http://thechangelog.com/137/
 0: http://thechangelog.com/137/feed/ "The Changelog » #137: Better GitHub Issues with HuBoard and Ryan Rauh Comments Feed" (application/rss+xml)
 1: http://thechangelog.com/feed/ "RSS 2.0 Feed" (application/rss+xml)
-Please enter a feed to subscribe to: 1
+Please enter a feed to subscribe to (or Ctrl-C to abort): [0, 1] 1
 Added feed:   4 http://thechangelog.com/feed/
 $ # cancel autodiscovery by pressing Ctrl-C
 $ f2e add http://thechangelog.com/137/
 0: http://thechangelog.com/137/feed/ "The Changelog » #137: Better GitHub Issues with HuBoard and Ryan Rauh Comments Feed" (application/rss+xml)
-Please enter a feed to subscribe to: ^C
+Please enter a feed to subscribe to (or Ctrl-C to abort): [0] ^C
 ~~~
 
 **Note:** When autodiscovering feeds, feed2email lists only those that don't
@@ -176,6 +176,8 @@ $ feed2email list
   2 https://github.com/agorf.atom
   3 http://www.rubyinside.com/feed/
   4 http://thechangelog.com/feed/
+
+Subscribed to 4 feeds
 ~~~
 
 A feed can be disabled so that it is not processed when `feed2email process`
@@ -200,7 +202,9 @@ It can also be removed from feed subscriptions permanently:
 ~~~ sh
 $ # same as "f2e r 1"
 $ feed2email remove 1
-Removed feed:   1 https://github.com/agorf/feed2email/commits.atom
+Remove feed:   1 https://github.com/agorf/feed2email/commits.atom
+Are you sure? [y, n] y
+Removed
 ~~~
 
 ### Migrating to/from feed2email
@@ -213,7 +217,7 @@ Export feed subscriptions to `feeds.xml`:
 ~~~ sh
 $ # same as "f2e e feeds.xml"
 $ feed2email export feeds.xml
-This may take a bit. Please wait...
+This may take a while. Please wait...
 Exported 3 feed subscriptions to feeds.xml
 ~~~
 
@@ -233,11 +237,17 @@ then try again:
 
 ~~~ sh
 $ f2e r 2
-Removed feed:   2 https://github.com/agorf.atom
+Remove feed:   2 https://github.com/agorf.atom
+Are you sure? [y/n] y
+Removed
 $ f2e r 3
-Removed feed:   3 http://www.rubyinside.com/feed/
+Remove feed:   3 http://www.rubyinside.com/feed/
+Are you sure? [y/n] y
+Removed
 $ f2e r 4
-Removed feed:   4 http://thechangelog.com/feed/
+Remove feed:   4 http://thechangelog.com/feed/
+Are you sure? [y/n] y
+Removed
 $ f2e l
 No feeds
 $ feed2email import feeds.xml
@@ -248,6 +258,28 @@ Imported feed:   3 http://thechangelog.com/feed/
 Imported 3 feed subscriptions from feeds.xml
 ~~~
 
+Passing the `--remove` option to `import` will remove any feeds not contained in
+the imported list, essentially synchronizing the feed subscriptions with it:
+
+~~~ sh
+$ # subscribe to a feed that is not in feeds.xml
+$ f2e a https://github.com/agorf/feed2email/commits.atom
+Added feed:   4 https://github.com/agorf/feed2email/commits.atom
+$ f2e l
+  1 https://github.com/agorf.atom
+  2 http://www.rubyinside.com/feed/
+  3 http://thechangelog.com/feed/
+  4 https://github.com/agorf/feed2email/commits.atom
+
+Subscribed to 4 feeds
+$ f2e import --remove feeds.xml
+Importing...
+Feed already exists:   1 https://github.com/agorf.atom
+Feed already exists:   2 http://www.rubyinside.com/feed/
+Feed already exists:   3 http://thechangelog.com/feed/
+Removed feed:   4 https://github.com/agorf/feed2email/commits.atom
+~~~
+
 ### Running
 
 ~~~ sh
@@ -282,4 +314,4 @@ Licensed under the MIT license (see [LICENSE.txt][license]).
 
 ## Author
 
-Aggelos Orfanakos, <http://agorf.gr/>
+Angelos Orfanakos, <http://agorf.gr/>

data/lib/feed2email/cli.rb

@@ -35,7 +35,7 @@ module Feed2Email
       if ENV['EDITOR']
         exec(ENV['EDITOR'], Feed2Email.config_path)
       else
-        abort 'EDITOR not set'
+        abort 'EDITOR environmental variable not set'
       end
     end
 
@@ -46,7 +46,7 @@ module Feed2Email
       end
 
       unless File.exist?(path)
-        puts 'This may take a bit. Please wait...'
+        puts 'This may take a while. Please wait...'
 
         if n = OPMLExporter.export(path)
           puts "Exported #{'feed subscription'.pluralize(n)} to #{path}"
@@ -59,11 +59,13 @@ module Feed2Email
     end
 
     desc 'import PATH', 'Import feed subscriptions as OPML from PATH'
+    option :remove, type: :boolean, default: false,
+      desc: "Unsubscribe from feeds not in imported list"
     def import(path)
       if File.exist?(path)
         puts 'Importing...'
 
-        if n = OPMLImporter.import(path)
+        if n = OPMLImporter.import(path, options[:remove])
           if n > 0
             puts "Imported #{'feed subscription'.pluralize(n)} from #{path}"
           end
@@ -79,7 +81,13 @@ module Feed2Email
     def list
       if Feed.any?
         puts Feed.by_smallest_id.to_a
-        puts "\nSubscribed to #{'feed'.pluralize(Feed.count)}"
+        print "\nSubscribed to #{'feed'.pluralize(Feed.count)}"
+
+        if Feed.where(enabled: false).count > 0
+          print " (#{Feed.enabled.count} enabled)"
+        end
+
+        puts
       else
         puts 'No feeds'
       end
@@ -97,7 +105,7 @@ module Feed2Email
       if feed
         puts "Remove feed: #{feed}"
 
-        if ask('Are you sure? (yes/no)') == 'yes'
+        if ask('Are you sure?', limited_to: %w{y n}) == 'y'
           if feed.delete
             puts 'Removed'
           else
@@ -169,7 +177,10 @@ module Feed2Email
         end
 
         begin
-          response = ask('Please enter a feed to subscribe to:')
+          response = ask(
+            'Please enter a feed to subscribe to (or Ctrl-C to abort):',
+            limited_to: (0...discovered_feeds.size).to_a.map(&:to_s)
+          )
         rescue Interrupt # Ctrl-C
           puts
           exit

data/lib/feed2email/opml_importer.rb

@@ -2,37 +2,49 @@ require 'nokogiri'
 
 module Feed2Email
   class OPMLImporter
-    def self.import(path)
+    def self.import(path, remove = false)
       require 'feed2email/feed'
 
-      n = 0
+      feeds = open(path) {|f| new(f).feeds }
 
-      open(path) do |f|
-        new(f).import do |uri|
-          if feed = Feed[uri: uri]
-            warn "Feed already exists: #{feed}"
+      imported = 0
+
+      feeds.each do |uri|
+        if feed = Feed[uri: uri]
+          warn "Feed already exists: #{feed}"
+        else
+          feed = Feed.new(uri: uri)
+
+          if feed.save(raise_on_failure: false)
+            puts "Imported feed: #{feed}"
+            imported += 1
+          else
+            warn "Failed to import feed: #{feed}"
+          end
+        end
+      end
+
+      if remove
+        Feed.exclude(uri: feeds).each do |feed|
+          if feed.delete
+            puts "Removed feed: #{feed}"
           else
-            feed = Feed.new(uri: uri)
-
-            if feed.save(raise_on_failure: false)
-              puts "Imported feed: #{feed}"
-              n += 1
-            else
-              warn "Failed to import feed: #{feed}"
-            end
+            warn "Failed to remove feed: #{feed}"
           end
         end
       end
 
-      n
+      imported
     end
 
     def initialize(io)
       @io = io
     end
 
-    def import(&blk)
-      uris.each(&blk)
+    def feeds
+      Nokogiri::XML(data).css('opml body outline').map {|outline|
+        outline['xmlUrl']
+      }.compact
     end
 
     private
@@ -42,11 +54,5 @@ module Feed2Email
     end
 
     def io; @io end
-
-    def uris
-      Nokogiri::XML(data).css('opml body outline').map {|outline|
-        outline['xmlUrl']
-      }.compact
-    end
   end
 end

data/lib/feed2email/version.rb

@@ -1,3 +1,3 @@
 module Feed2Email
-  VERSION = '0.10.0'
+  VERSION = '0.11.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: feed2email
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.1
 platform: ruby
 authors:
-- Aggelos Orfanakos
+- Angelos Orfanakos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-04 00:00:00.000000000 Z
+date: 2015-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: feedzirra
@@ -209,9 +209,9 @@ dependencies:
 description: 
 email: me@agorf.gr
 executables:
-- f2e
 - feed2email-migrate
 - feed2email
+- f2e
 extensions: []
 extra_rdoc_files: []
 files: