cmus-bt 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 40f75a07520ceab5bd721323a216a5bf0f846e27c3068de91b53823ed13c2c13
-  data.tar.gz: 8efa1239b84969b51c5e82267ebdcf3ade22fcbd35d5824b243ccd7524836433
+  metadata.gz: 5eb8d1c1799109a59a6af9715bb52ac9f5953feafc9f66659ac8cfb3599317ad
+  data.tar.gz: a0516ec4172eebab275b43e1e2ecab38d4faeef4b14d4764c61675accaa9125c
 SHA512:
-  metadata.gz: 49d59dcc858a9501e11506a15148b064b1bec027add482a0b110c4fb56920bb39c2a3593ccb6ff95fdc87aacb0c2a9d57c1c470a23dbdaf120b5e0fdb5e1f63a
-  data.tar.gz: 36ca6db14d83743669db3d858cab55a6c58b560db8ee110aaa8fff2699c01ee733dee6f76ed13ac46b274e04ec83962c2020e78eb26aa156b9f0c25d86ac5602
+  metadata.gz: a88776b65a4b6a5039e52827b89ecd3ea4e22cb1b8b6ef61a47ca80d32a384d2683b80bba6a41fa99e53204990662aa973bb89e9e78bc5d54013873178ed6b63
+  data.tar.gz: c8d279072f4d4c6d3508cb90f06a234164414b955dcc54b66f8c46ddbee8fb7c5c5cc39084ec563232539a8c985b13e32a5485956fd1f043d41be11dec6eceae

data/Rakefile

@@ -0,0 +1,2 @@
+require "bundler/gem_tasks"
+task :default => :spec

data/lib/cmus-bt/device/bluetooth.rb

@@ -34,17 +34,15 @@ module CMusBt
         private :root
 
         def objman
-          @objman ||=
-              root["org.freedesktop.DBus.ObjectManager"].GetManagedObjects
-
-          return @objman
+          return @objman ||= root["org.freedesktop.DBus.ObjectManager"]
         end
         private :objman
 
         def list
           ret = []
+          dir = objman.GetManagedObjects()
 
-          objman.each { |path, hash|
+          dir.each { |path, hash|
             next if not hash.keys.include?("org.bluez.Device1")
 
             iface = hash["org.bluez.Device1"]

data/lib/cmus-bt/main.rb

@@ -37,7 +37,7 @@ module CMusBt
         list = availables()
        
         if list.empty?
-          print("Available device is not exist.")
+          print("Available device is not exist.\n")
 
         else
           list.each { |info| 
@@ -64,10 +64,12 @@ module CMusBt
 
         thread = Thread.fork {Player.daemon(info)}
         status = system("cmus")
+        raise("execute cmus failed.") if not status.success?
 
-        thread.raise
+      ensure
+        thread&.raise
+        thread&.join
         $logger.info("exit #{APP_NAME}")
-        exit(status)
       end
       private :run_app
 
@@ -82,6 +84,10 @@ module CMusBt
         else
           raise("Not implement yet")
         end
+
+      rescue Exception => e
+        STDERR.print("#{e.message}\n")
+        exit(1)
       end
     end
   end

data/lib/cmus-bt/player.rb

@@ -15,10 +15,10 @@ module CMusBt
     EVENT_STRUCTURE = "l!l!S!S!i!"
 
     FUNC_TABLE      = {
-      200 => :do_play,  # KEY_PLAYCD
-      201 => :do_pause, # KEY_PAUSECD
-      163 => :do_next,  # KEY_NEXTSONG
-      165 => :do_prev,  # KEY_PREVIOUSSONG
+      200 => :on_play,  # KEY_PLAYCD
+      201 => :on_pause, # KEY_PAUSECD
+      163 => :on_next,  # KEY_NEXTSONG
+      165 => :on_prev,  # KEY_PREVIOUSSONG
     }
 
     class << self
@@ -68,7 +68,7 @@ module CMusBt
       end
       private :read_meta
 
-      def do_play
+      def on_play
         if status == :playing
           system("cmus-remote --pause")
           $logger.info("PAUSE")
@@ -77,25 +77,25 @@ module CMusBt
           $logger.info("PLAY")
         end
       end
-      private :do_play
+      private :on_play
 
-      def do_pause
+      def on_pause
         system("cmus-remote --pause")
         $logger.info("PAUSE")
       end
-      private :do_pause
+      private :on_pause
 
-      def do_next
+      def on_next
         system("cmus-remote --next")
         $logger.info("NEXT")
       end
-      private :do_next
+      private :on_next
 
-      def do_prev
+      def on_prev
         system("cmus-remote --prev")
         $logger.info("PREV")
       end
-      private :do_prev
+      private :on_prev
 
       def daemon(info)
         io   = File.open(info[:dev_file], "rb")

data/lib/cmus-bt/version.rb

@@ -1,3 +1,3 @@
 module CMusBt
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cmus-bt
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Hirosho Kuwagata
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-23 00:00:00.000000000 Z
+date: 2020-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -78,6 +78,7 @@ files:
 - Gemfile
 - LICENSE
 - README.md
+- Rakefile
 - bin/cmus-bt
 - cmus-bt.gemspec
 - lib/cmus-bt/device.rb