ayadn 1.4.2 → 1.4.3

data/lib/ayadn/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Ayadn
-  VERSION = "1.4.2"
+  VERSION = "1.4.3"
 end

data/lib/ayadn/view.rb

@@ -81,7 +81,9 @@ module Ayadn
         t.title = "Current Ayadn settings".color(:cyan)
         t.headings = [ "Category".color(:red), "Parameter".color(:red), "Value(s)".color(:red) ]
         @iter = 0
-        Settings.options.each do |k,v|
+        opts = Settings.options.dup
+        opts.each do |k,v|
+          v.delete_if {|ke,_| ke == :deleted || ke == :annotations } # not mutable values
           v.each do |x,y|
             t << :separator if @iter >= 1
             unless y.is_a?(Hash)
@@ -95,6 +97,7 @@ module Ayadn
           end
         end
       end
+      clear_screen()
       puts table
     end
 

data/lib/ayadn.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 require_relative 'ayadn/version'
 
-%w{rest_client json thor rainbow/ext/string terminal-table yaml logger daybreak fileutils io/console unicode_utils/char_type}.each { |r| require "#{r}" }
+%w{rest_client json thor rainbow/ext/string terminal-table yaml logger daybreak fileutils io/console unicode_utils/char_type readline}.each { |r| require "#{r}" }
 
 # winPlatforms = ['mswin', 'mingw', 'mingw_18', 'mingw_19', 'mingw_20', 'mingw32']
 # case Gem::Platform.local.os

data/spec/spec_helper.rb

@@ -4,7 +4,7 @@ require 'ayadn'
 #require 'fakefs/spec_helpers'
 
 RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
+  # config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
   # Run specs in random order to surface order dependencies. If you find an

data/spec/unit/blacklistworkers_spec.rb

@@ -54,37 +54,37 @@ describe Ayadn::BlacklistWorkers do
       k = Ayadn::BlacklistWorkers.new
       k.add(['client', 'IFTTT'])
       expect(Ayadn::Databases.blacklist['ifttt']).to eq :client
-      expect(File.read('spec/mock/ayadn.log')).to include "(wee) INFO -- Added '[\"IFTTT\"]' to blacklist of clients."
+      #expect(File.read('spec/mock/ayadn.log')).to include "(wee) INFO -- Added '[\"IFTTT\"]' to blacklist of clients."
     end
     it "adds a client to the blacklist" do
       k = Ayadn::BlacklistWorkers.new
       k.add(['source', 'Zapier'])
       expect(Ayadn::Databases.blacklist['zapier']).to eq :client
-      expect(File.read('spec/mock/ayadn.log')).to include "(wee) INFO -- Added '[\"Zapier\"]' to blacklist of clients."
+      #expect(File.read('spec/mock/ayadn.log')).to include "(wee) INFO -- Added '[\"Zapier\"]' to blacklist of clients."
     end
     it "adds a hashtag to the blacklist" do
       k = Ayadn::BlacklistWorkers.new
       k.add(['hashtag', 'Sports'])
       expect(Ayadn::Databases.blacklist['sports']).to eq :hashtag
-      expect(File.read('spec/mock/ayadn.log')).to include "(wee) INFO -- Added '[\"Sports\"]' to blacklist of hashtags."
+      #expect(File.read('spec/mock/ayadn.log')).to include "(wee) INFO -- Added '[\"Sports\"]' to blacklist of hashtags."
     end
     it "adds a hashtag to the blacklist" do
       k = Ayadn::BlacklistWorkers.new
       k.add(['tag', 'tv'])
       expect(Ayadn::Databases.blacklist['tv']).to eq :hashtag
-      expect(File.read('spec/mock/ayadn.log')).to include "(wee) INFO -- Added '[\"tv\"]' to blacklist of hashtags."
+      #expect(File.read('spec/mock/ayadn.log')).to include "(wee) INFO -- Added '[\"tv\"]' to blacklist of hashtags."
     end
     it "adds a mention to the blacklist" do
       k = Ayadn::BlacklistWorkers.new
       k.add(['mention', 'mrTest'])
       expect(Ayadn::Databases.blacklist['@mrtest']).to eq :mention
-      expect(File.read('spec/mock/ayadn.log')).to include "(wee) INFO -- Added '[\"@mrTest\"]' to blacklist of mentions."
+      #expect(File.read('spec/mock/ayadn.log')).to include "(wee) INFO -- Added '[\"@mrTest\"]' to blacklist of mentions."
     end
     it "adds a mention to the blacklist" do
       k = Ayadn::BlacklistWorkers.new
       k.add(['mentions', 'yolo'])
       expect(Ayadn::Databases.blacklist['@yolo']).to eq :mention
-      expect(File.read('spec/mock/ayadn.log')).to include "(wee) INFO -- Added '[\"@yolo\"]' to blacklist of mentions."
+      #expect(File.read('spec/mock/ayadn.log')).to include "(wee) INFO -- Added '[\"@yolo\"]' to blacklist of mentions."
     end
   end
 
@@ -93,11 +93,11 @@ describe Ayadn::BlacklistWorkers do
       k = Ayadn::BlacklistWorkers.new
       k.add(['client', 'IFTTT'])
       expect(Ayadn::Databases.blacklist['ifttt']).to eq :client
-      expect(File.read('spec/mock/ayadn.log')).to include "(wee) INFO -- Added '[\"IFTTT\"]' to blacklist of clients."
+      #expect(File.read('spec/mock/ayadn.log')).to include "(wee) INFO -- Added '[\"IFTTT\"]' to blacklist of clients."
       k = Ayadn::BlacklistWorkers.new
       k.remove(['client', 'IFTTT'])
       expect(Ayadn::Databases.blacklist['ifttt']).to eq nil
-      expect(File.read('spec/mock/ayadn.log')).to include "(wee) INFO -- Removed 'client:[\"IFTTT\"]' from blacklist."
+      #expect(File.read('spec/mock/ayadn.log')).to include "(wee) INFO -- Removed 'client:[\"IFTTT\"]' from blacklist."
     end
   end
 

data/spec/unit/post_spec.rb

@@ -71,41 +71,41 @@ describe Ayadn::Post do
     it "formats a reply" do
       new_post = "Hey guys!"
       replied_to = {1=>{:handle => "@test",:username => "test", :mentions => ["user1", "user2"]}}
-      post.reply(new_post, replied_to).should eq "@test Hey guys! @user1 @user2"
+      expect(post.reply(new_post, replied_to)).to eq "@test Hey guys! @user1 @user2"
       replied_to = {1=>{:handle => "@test",:username => "test", :mentions => ["user1", "test"]}}
-      post.reply(new_post, replied_to).should eq "@test Hey guys! @user1"
+      expect(post.reply(new_post, replied_to)).to eq "@test Hey guys! @user1"
       replied_to = {1=>{:handle => "@yo",:username => "test", :mentions => ["test", "lol"]}}
-      post.reply(new_post, replied_to).should eq "@yo Hey guys! @lol"
+      expect(post.reply(new_post, replied_to)).to eq "@yo Hey guys! @lol"
     end
   end
 
   describe "#text_is_empty?" do
     it "checks if empty" do
-      post.text_is_empty?(["allo"]).should be false
-      post.text_is_empty?([""]).should be true
-      post.text_is_empty?([]).should be true
+      expect(post.text_is_empty?(["allo"])).to be false
+      expect(post.text_is_empty?([""])).to be true
+      expect(post.text_is_empty?([])).to be true
     end
   end
 
   describe "#markdown_extract" do
     it "splits markdown" do
-      post.markdown_extract("[ayadn](http://ayadn-app.net)").should eq ["ayadn", "http://ayadn-app.net"]
+      expect(post.markdown_extract("[ayadn](http://ayadn-app.net)")).to eq ["ayadn", "http://ayadn-app.net"]
     end
   end
 
   describe "#get_markdown_text" do
     it "extracts markdown text" do
-      post.get_markdown_text("[ayadn](http://ayadn-app.net)").should eq "ayadn"
+      expect(post.get_markdown_text("[ayadn](http://ayadn-app.net)")).to eq "ayadn"
     end
   end
 
   describe "#check_post_length" do
     it "checks normal post length" do
-      post.check_post_length(["allo", "wtf"]).should be nil #no error
+      expect(post.check_post_length(["allo", "wtf"])).to be nil #no error
     end
     it "checks excessive post length" do
       printed = capture_stderr do
-        lambda {post.check_post_length(["allo", "wtf dude", "ok whatever pfff", "Black malt berliner weisse, filter. Ibu degrees plato alcohol. ipa hard cider ester infusion conditioning tank. Dry stout bottom fermenting yeast wort chiller wort chiller lager hand pump ! All-malt dunkle bright beer grainy, original gravity wheat beer glass."])}.should raise_error(SystemExit)
+        expect(lambda {post.check_post_length(["allo", "wtf dude", "ok whatever pfff", "Black malt berliner weisse, filter. Ibu degrees plato alcohol. ipa hard cider ester infusion conditioning tank. Dry stout bottom fermenting yeast wort chiller wort chiller lager hand pump ! All-malt dunkle bright beer grainy, original gravity wheat beer glass."])}).to raise_error(SystemExit)
       end
       expect(printed).to include 'Canceled: too long. 256 max, 32 characters to remove.'
     end
@@ -113,11 +113,11 @@ describe Ayadn::Post do
 
   describe "#check_message_length" do
     it "checks normal message length" do
-      post.check_message_length(["allo", "wtf"]).should be nil #no error
+      expect(post.check_message_length(["allo", "wtf"])).to be nil #no error
     end
     it "checks excessive message length" do
       printed = capture_stderr do
-        lambda {post.check_message_length(["Black malt berliner weisse, filter. Ibu degrees plato alcohol. ipa hard cider ester infusion conditioning tank. Dry stout bottom fermenting yeast wort chiller wort chiller lager hand pump ! All-malt dunkle bright beer grainy, original gravity wheat beer glass!!" * 8])}.should raise_error(SystemExit)
+        expect(lambda {post.check_message_length(["Black malt berliner weisse, filter. Ibu degrees plato alcohol. ipa hard cider ester infusion conditioning tank. Dry stout bottom fermenting yeast wort chiller wort chiller lager hand pump ! All-malt dunkle bright beer grainy, original gravity wheat beer glass!!" * 8])}).to raise_error(SystemExit)
       end
       expect(printed).to include 'Canceled: too long. 2048 max, 40 characters to remove.'
     end

data/spec/unit/set_spec.rb

@@ -112,19 +112,19 @@ describe Ayadn::SetCounts do
     end
     it "raises error if incorrect count value" do
       printed = capture_stderr do
-        lambda {Ayadn::SetCounts.new.validate('201')}.should raise_error(SystemExit)
+        expect(lambda {Ayadn::SetCounts.new.validate('201')}).to raise_error(SystemExit)
       end
       expect(printed).to include 'This paramater must be an integer between 1 and 200'
     end
     it "raises error if incorrect count value" do
       printed = capture_stderr do
-        lambda {Ayadn::SetCounts.new.validate('0')}.should raise_error(SystemExit)
+        expect(lambda {Ayadn::SetCounts.new.validate('0')}).to raise_error(SystemExit)
       end
       expect(printed).to include 'This paramater must be an integer between 1 and 200'
     end
     it "raises error if incorrect count value" do
       printed = capture_stderr do
-        lambda {Ayadn::SetCounts.new.validate('yolo')}.should raise_error(SystemExit)
+        expect(lambda {Ayadn::SetCounts.new.validate('yolo')}).to raise_error(SystemExit)
       end
       expect(printed).to include 'This paramater must be an integer between 1 and 200'
     end
@@ -165,7 +165,7 @@ describe Ayadn::SetBackup do
     end
     it "raises error if incorrect boolean" do
       printed = capture_stderr do
-        lambda {Ayadn::SetBackup.new.validate('yolo')}.should raise_error(SystemExit)
+        expect(lambda {Ayadn::SetBackup.new.validate('yolo')}).to raise_error(SystemExit)
       end
       expect(printed).to include "You have to submit valid items. See 'ayadn -sg' for a list of valid parameters and values"
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ayadn
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.4.3
 platform: ruby
 authors:
 - Eric Dejonckheere
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-15 00:00:00.000000000 Z
+date: 2014-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -293,7 +293,7 @@ rubyforge_project:
 rubygems_version: 2.3.0
 signing_key: 
 specification_version: 4
-summary: App.net command-line client.
+summary: App.net command-line client. See http://ayadn-app.net/doc/
 test_files:
 - spec/helpers.rb
 - spec/mock/@ericd.json