ayadn 1.0.13 → 1.1.0

data/lib/ayadn/status.rb

@@ -16,6 +16,9 @@ module Ayadn
     def self.deleting_post(post_id)
       "\nDeleting post #{post_id}\n".inverse
     end
+    def self.deleting_message(message_id)
+      "\nDeleting message #{message_id}\n".inverse
+    end
     def self.unfollowing(username)
       "\nUnfollowing #{username}\n".inverse
     end
@@ -82,6 +85,9 @@ module Ayadn
     def self.deleted(post_id)
       "\nPost #{post_id} has been deleted.\n".color(:green)
     end
+    def self.deleted_m(message_id)
+      "\nMessage #{message_id} has been deleted.\n".color(:green)
+    end
     def self.starred(post_id)
       "\nPost #{post_id} has been starred.\n".color(:green)
     end
@@ -118,6 +124,9 @@ module Ayadn
     def self.error_missing_post_id
       "\nYou have to specify a post id.\n".color(:red)
     end
+    def self.error_missing_message_id
+      "\nYou have to specify a message id.\n".color(:red)
+    end
     def self.error_missing_channel_id
       "\nYou have to specify a channel id.\n".color(:red)
     end
@@ -136,12 +145,18 @@ module Ayadn
     def self.stopped
       "\n\nStopped.".color(:red)
     end
+    def self.writing
+      "\nPosting as ".color(:cyan) + "#{Settings.config[:identity][:handle]}".color(:green) + ".".color(:cyan)
+    end
     def self.yourpost
       "\nYour post:\n\n".color(:cyan)
     end
     def self.yourmessage
       "\nYour message:\n\n".color(:cyan)
     end
+    def self.message_from(username)
+      "\nMessage from ".color(:cyan) + "#{Settings.config[:identity][:handle]} ".color(:green) + "to ".color(:cyan) + "#{username[0]}".color(:yellow) + ".".color(:cyan)
+    end
     def self.replying_to(post_id)
       "\nReplying to post #{post_id}...\n".color(:green)
     end
@@ -152,13 +167,13 @@ module Ayadn
     #   "\nType your text. ".color(:cyan) + "[ENTER] ".color(:green) + "to validate, ".color(:cyan) + "[CTRL+C] ".color(:red) + "to cancel.\n\n".color(:cyan)
     # end
     def self.reply
-      "\n#{Settings.config[:post_max_length]} ".color(:yellow) + "characters maximum. If the original post has mentions, you text will be inserted after the first one. Markdown links are supported.\n"
+      "\n#{Settings.config[:post_max_length]} ".color(:yellow) + "characters maximum.\n"
     end
     def self.post
-      "\n#{Settings.config[:post_max_length]} ".color(:yellow) + "characters maximum. Markdown links are supported.\n"
+      "\n#{Settings.config[:post_max_length]} ".color(:yellow) + "characters maximum.\n"
     end
     def self.message
-      "\n#{Settings.config[:message_max_length]} ".color(:yellow) + "characters maximum. Markdown links are supported.\n"
+      "\n#{Settings.config[:message_max_length]} ".color(:yellow) + "characters maximum.\n"
     end
     # def self.method_missing(meth, args)
     #   "\nThe command '#{meth} #{args}' doesn't exist.\n".color(:red)

data/lib/ayadn/version.rb

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

data/lib/ayadn/workers.rb

@@ -95,11 +95,11 @@ module Ayadn
       posts = {}
 
       data.each.with_index(1) do |post, index|
-        next if Databases.blacklist[post['source']['name']]
+        next if Databases.blacklist[post['source']['name'].downcase]
         hashtags = extract_hashtags(post)
         @skip = false
         hashtags.each do |h|
-          if Databases.blacklist[h]
+          if Databases.blacklist[h.downcase]
             @skip = true
             break
           end
@@ -108,7 +108,7 @@ module Ayadn
         mentions= []
         post['entities']['mentions'].each { |m| mentions << m['name'] }
         mentions.each do |m|
-          if Databases.blacklist["@" + m]
+          if Databases.blacklist["@" + m.downcase]
             @skip = true
             break
           end
@@ -292,13 +292,7 @@ module Ayadn
           if word =~ /#\w+/
             words << word.gsub(/#{reg_tag}/, '#\1'.color(hashtag_color))
           elsif word =~ /@\w+/
-            splitted = word.split(/#{reg_split}/) if word =~ /#{reg_split}/
-            if splitted
-              splitted.each {|d| @str = d if d =~ /@\w+/}
-              @str = word if @str.nil?
-            else
-              @str = word
-            end
+            @str = def_str(word, reg_split)
             if handles.include?(@str.downcase)
               words << word.gsub(/#{reg_mention}/, '@\1'.color(mention_color))
             else
@@ -316,6 +310,17 @@ module Ayadn
 
     private
 
+    def def_str(word, reg_split)
+      splitted = word.split(/#{reg_split}/) if word =~ /#{reg_split}/
+      if splitted
+        splitted.each {|d| @str = d if d =~ /@\w+/}
+        return word if @str.nil?
+        @str
+      else
+        word
+      end
+    end
+
     def init_table
       Terminal::Table.new do |t|
         t.style = { :width => Settings.options[:formats][:table][:width] }

data/spec/unit/blacklistworkers_spec.rb

@@ -53,20 +53,20 @@ describe Ayadn::BlacklistWorkers do
     it "adds a client to the blacklist" do
       k = Ayadn::BlacklistWorkers.new
       k.add(['client', 'IFTTT'])
-      expect(Ayadn::Databases.blacklist['IFTTT']).to eq :client
+      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."
     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(Ayadn::Databases.blacklist['zapier']).to eq :client
       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'])
+      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
@@ -76,9 +76,9 @@ describe Ayadn::BlacklistWorkers do
     end
     it "adds a mention to the blacklist" do
       k = Ayadn::BlacklistWorkers.new
-      k.add(['mention', 'mrtest'])
+      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
@@ -92,11 +92,11 @@ describe Ayadn::BlacklistWorkers do
     it "removes a client from the blacklist" do
       k = Ayadn::BlacklistWorkers.new
       k.add(['client', 'IFTTT'])
-      expect(Ayadn::Databases.blacklist['IFTTT']).to eq :client
+      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."
       k = Ayadn::BlacklistWorkers.new
       k.remove(['client', 'IFTTT'])
-      expect(Ayadn::Databases.blacklist['IFTTT']).to eq nil
+      expect(Ayadn::Databases.blacklist['ifttt']).to eq nil
       expect(File.read('spec/mock/ayadn.log')).to include "(wee) INFO -- Removed 'client:IFTTT' from blacklist."
     end
   end

metadata

@@ -1,181 +1,181 @@
 --- !ruby/object:Gem::Specification
 name: ayadn
 version: !ruby/object:Gem::Version
-  version: 1.0.13
+  version: 1.1.0
 platform: ruby
 authors:
 - Eric Dejonckheere
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-25 00:00:00.000000000 Z
+date: 2014-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.18'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.18'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: terminal-table
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.4'
 - !ruby/object:Gem::Dependency
   name: daybreak
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.3'
 - !ruby/object:Gem::Dependency
   name: pinboard
   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
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.14'
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
   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'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
 - !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'
 description: 'App.net command-line client: toolbox to access and manage your ADN data,
@@ -187,10 +187,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .coveralls.yml
-- .gitignore
-- .rspec
-- .travis.yml
+- ".coveralls.yml"
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - Guardfile
@@ -259,17 +259,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: App.net command-line client.