ayadn 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec4024b66d88bd66154dec00328a519791012ec6
-  data.tar.gz: 723fa86ee438661970ea213b71f69bd3f5b78e62
+  metadata.gz: aff30a9bc5c1bb18519f3dab1152c3b19f7b5005
+  data.tar.gz: 580767690f9388fcbaf26e223ca2ac76474a1ff7
 SHA512:
-  metadata.gz: dc50e43e6f535da4b7c686aefcfb634d6406b3ac4109f1422be2ac44c2b0c536027d5cc07c4f311ce17c4c164990b718c7cac75e2c9aae03eb2440a0b1a314c3
-  data.tar.gz: 91df36971df60e26dcf8f90aa836401780af35bb70a6c40dfd1fe9aa9ba529c5792a01f06f69a78126ccb5acddb9efa3d2ae57b2d5deb03b5b8e170ecacbf9cc
+  metadata.gz: a41e1953abbe7b5968bb86ebeb69e0c8d1f7d2a3ae00a0cb571ec4c0c519adedfd830bf946a17c2064fd7fe9b006ecb6e1528ec3319c1be276d7f291b8a0e4d7
+  data.tar.gz: a18acf5eeb4fcc57a0243baa4874f98f8ad458e96c57e8c17d63d07d19cc0d53e182988bab1bb9d199b3cc630f4bdcecbce261e51da4411fca615d9af9f46550

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 1.1.1 - 'State Of The Union'
+
+- Star and unstar a reposted post
+- Nowplaying shows an error message if iTunes is closed or not currently playing any track
+
 # 1.1.0 - 'Leviathan'
 
 - Show who's writing, and who's the recipient

data/lib/ayadn/action.rb

@@ -379,8 +379,11 @@ module Ayadn
       begin
         missing_post_id unless post_id.is_integer?
         puts Status.unstarring(post_id)
-        if @api.get_details(post_id)['data']['you_starred']
-          check_has_been_unstarred(post_id, @api.unstar(post_id))
+        resp = @api.get_details(post_id)
+        id = get_original_id(post_id, resp)
+        resp = @api.get_details(id)
+        if resp['data']['you_starred']
+          check_has_been_unstarred(id, @api.unstar(id))
         else
           puts Status.not_your_starred
         end
@@ -395,8 +398,10 @@ module Ayadn
       begin
         missing_post_id unless post_id.is_integer?
         puts Status.starring(post_id)
-        check_if_already_starred(@api.get_details(post_id))
-        check_has_been_starred(post_id, @api.star(post_id))
+        resp = @api.get_details(post_id)
+        check_if_already_starred(resp)
+        id = get_original_id(post_id, resp)
+        check_has_been_starred(id, @api.star(id))
       rescue => e
         Errors.global_error("action/star", post_id, e)
       ensure
@@ -837,7 +842,6 @@ module Ayadn
           abort(Status.empty_fields) if el.length == 0
         end
         @view.clear_screen
-        #text_to_post = "#nowplaying '#{itunes.track}' from '#{itunes.album}' by #{itunes.artist}"
         text_to_post = "#nowplaying\nTitle: ‘#{itunes.track}’\nArtist: #{itunes.artist}\nfrom ‘#{itunes.album}’"
         puts Status.writing
         show_nowplaying(text_to_post)
@@ -852,8 +856,6 @@ module Ayadn
       rescue => e
         puts Status.wtf
         Errors.global_error("action/nowplaying", itunes, e)
-      # ensure
-      #   Databases.close_all
       end
     end
 
@@ -1179,6 +1181,11 @@ module Ayadn
 
     def get_track_infos
       track = `osascript -e 'tell application "iTunes"' -e 'set trackName to name of current track' -e 'return trackName' -e 'end tell'`
+      if track.empty?
+        puts "\nCanceled: unable to get info from iTunes.\n".color(:red)
+        Errors.warn "Nowplaying canceled: unable to get info from iTunes."
+        exit
+      end
       album = `osascript -e 'tell application "iTunes"' -e 'set trackAlbum to album of current track' -e 'return trackAlbum' -e 'end tell'`
       artist = `osascript -e 'tell application "iTunes"' -e 'set trackArtist to artist of current track' -e 'return trackArtist' -e 'end tell'`
       maker = Struct.new(:artist, :album, :track)

data/lib/ayadn/authorize.rb

@@ -28,7 +28,7 @@ module Ayadn
       puts "Saving user token...\n".color(:green)
       create_token_file(user)
       puts "Creating user account for #{user.handle}...\n".color(:green)
-      accounts_db = Daybreak::DB.new("#{user.home_path}/accounts.db")
+      accounts_db = Databases.init("#{user.home_path}/accounts.db")
       create_account(user, accounts_db)
     end
 

data/lib/ayadn/databases.rb

@@ -8,11 +8,11 @@ module Ayadn
     end
 
     def self.open_databases
-      @users = Daybreak::DB.new "#{Settings.config[:paths][:db]}/users.db"
-      @index = Daybreak::DB.new "#{Settings.config[:paths][:pagination]}/index.db"
-      @pagination = Daybreak::DB.new "#{Settings.config[:paths][:pagination]}/pagination.db"
-      @aliases = Daybreak::DB.new "#{Settings.config[:paths][:db]}/aliases.db"
-      @blacklist = Daybreak::DB.new "#{Settings.config[:paths][:db]}/blacklist.db"
+      @users = self.init "#{Settings.config[:paths][:db]}/users.db"
+      @index = self.init "#{Settings.config[:paths][:pagination]}/index.db"
+      @pagination = self.init "#{Settings.config[:paths][:pagination]}/pagination.db"
+      @aliases = self.init "#{Settings.config[:paths][:db]}/aliases.db"
+      @blacklist = self.init "#{Settings.config[:paths][:db]}/blacklist.db"
     end
 
     def self.close_all
@@ -24,6 +24,16 @@ module Ayadn
       end
     end
 
+    def self.init(path)
+      winPlatforms = ['mswin', 'mingw', 'mingw_18', 'mingw_19', 'mingw_20', 'mingw32']
+      case RbConfig::CONFIG['host_os']
+      when *winPlatforms
+        abort("\nSorry, Ayadn doesn't work on Windows.\n\n".color(:red))
+      else
+        Daybreak::DB.new "#{path}"
+      end
+    end
+
     def self.add_mention_to_blacklist(target)
       @blacklist[target.downcase] = :mention
     end
@@ -37,7 +47,7 @@ module Ayadn
       @blacklist.delete(target.downcase)
     end
     def self.import_blacklist(blacklist)
-      new_list = Daybreak::DB.new blacklist
+      new_list = self.init blacklist
       new_list.each {|name,type| @blacklist[name] = type}
       new_list.close
     end
@@ -68,7 +78,7 @@ module Ayadn
     end
 
     def self.import_aliases(aliases)
-      new_aliases = Daybreak::DB.new aliases
+      new_aliases = self.init aliases
       new_aliases.each {|al,id| @aliases[al] = id}
       new_aliases.close
     end

data/lib/ayadn/settings.rb

@@ -12,7 +12,7 @@ module Ayadn
     def self.load_config
       acc_db = Dir.home + "/ayadn/accounts.db"
       self.check_for_accounts(acc_db)
-      db = Daybreak::DB.new(acc_db)
+      db = Databases.init acc_db
       active = db['ACTIVE']
       home = db[active][:path]
       @config = {

data/lib/ayadn/status.rb

@@ -83,22 +83,22 @@ module Ayadn
       "Could not block user #{username} (doesn't exist, or is already blocked)\n".color(:red)
     end
     def self.deleted(post_id)
-      "\nPost #{post_id} has been deleted.\n".color(:green)
+      "Post #{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)
+      "Post #{post_id} has been starred.\n".color(:green)
     end
     def self.unreposted(post_id)
-      "\nPost #{post_id} has been unreposted.\n".color(:green)
+      "Post #{post_id} has been unreposted.\n".color(:green)
     end
     def self.reposted(post_id)
-      "\nPost #{post_id} has been reposted.\n".color(:green)
+      "Post #{post_id} has been reposted.\n".color(:green)
     end
     def self.unstarred(post_id)
-      "\nPost #{post_id} has been unstarred.\n".color(:green)
+      "Post #{post_id} has been unstarred.\n".color(:green)
     end
     def self.unfollowed(username)
       "\nUser #{username} has been unfollowed.\n".color(:green)

data/lib/ayadn/switch.rb

@@ -4,7 +4,7 @@ module Ayadn
     def list
       home_path = Dir.home + "/ayadn"
       if File.exist?("#{home_path}/accounts.db")
-        accounts_db = Daybreak::DB.new("#{home_path}/accounts.db")
+        accounts_db = Databases.init("#{home_path}/accounts.db")
         active = accounts_db['ACTIVE']
         begin
           puts "\nCurrently authorized accounts:\n".color(:cyan)
@@ -33,7 +33,7 @@ module Ayadn
       username = Workers.remove_arobase_if_present(user.first)
       home_path = Dir.home + "/ayadn"
       if File.exist?("#{home_path}/accounts.db")
-        accounts_db = Daybreak::DB.new("#{home_path}/accounts.db")
+        accounts_db = Databases.init("#{home_path}/accounts.db")
         active = accounts_db['ACTIVE']
         if username == accounts_db[active][:username]
           puts "\nYou're already authorized with username '#{accounts_db[active][:handle]}'.\n".color(:red)

data/lib/ayadn/version.rb

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

data/lib/ayadn.rb

@@ -3,10 +3,11 @@ require_relative 'ayadn/version'
 
 %w{rest_client json thor rainbow/ext/string terminal-table yaml logger daybreak fileutils io/console}.each { |r| require "#{r}" }
 
-# winPlatforms = ['mswin', 'mingw', 'mingw_18', 'mingw_19', 'mingw_20', 'mingw32']
-# case Gem::Platform.local.os
-# when *winPlatforms
-#   require 'win32console'
-# end
+winPlatforms = ['mswin', 'mingw', 'mingw_18', 'mingw_19', 'mingw_20', 'mingw32']
+case Gem::Platform.local.os
+when *winPlatforms
+  require 'win32console'
+  require 'pstore'
+end
 
 require_relative 'ayadn/app'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ayadn
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Eric Dejonckheere
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-28 00:00:00.000000000 Z
+date: 2014-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor