dhun 0.5.6 → 0.6.0

data/lib/dhun/server.rb

@@ -1,50 +1,8 @@
-require 'eventmachine'
+require 'rubygems'
 require 'daemons'
-module Dhun
-  class Server
-    
-    attr_reader :logger
 
-    def initialize(options)
-      @options = options
-      @socket = options[:socket]
-      @logger = Logger.instance
-      setup_signals
-    end
-
-    def start
-      if @options[:daemonize]
-         logger.log "Starting Dhun"
-        exit if fork
-        Process.setsid
-        log_file = @options[:log] || @options[:default_log]
-        exec("#{ENV['_']} start -l #{log_file} #{@options[:debug] ? "-D" : ""}")
-      end
-      logger.file = @options[:log] if @options[:log]
-      logger.log "Starting Dhun"
-      at_exit { remove_socket_file }
-      EventMachine::run {
-        EventMachine::start_server @socket, DhunServer
-      }
-    end
-
-    def self.stop
-      Logger.instance.log "Stopping Dhun"
-      EventMachine.stop if EventMachine.reactor_running?
-      exit
-    end
-
-    protected
-    # Register signals:
-    # * calls +stop+ to shutdown gracefully.
-    def setup_signals
-      trap('QUIT') { Server.stop }
-      trap('INT')  { Server.stop }
-      trap('TERM') { Server.stop }
-    end
-     
-    def remove_socket_file
-      File.delete(@socket) if File.exist?(@socket)
-    end
-  end
-end
+dhun_server = File.dirname(__FILE__)+"/dhun_server.rb"
+Daemons.run(dhun_server,
+  :dir_mode => :normal,
+  :dir => '/tmp/'
+)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dhun
 version: !ruby/object:Gem::Version 
-  version: 0.5.6
+  version: 0.6.0
 platform: ruby
 authors: 
 - Deepak Jois
@@ -9,9 +9,29 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-18 00:00:00 -08:00
+date: 2010-01-12 00:00:00 -08:00
 default_executable: 
 dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: riot
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.10.11
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: rr
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.10.5
+    version: 
 - !ruby/object:Gem::Dependency 
   name: eventmachine
   type: :runtime
@@ -42,6 +62,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.0.10
     version: 
+- !ruby/object:Gem::Dependency 
+  name: thor
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.12.0
+    version: 
 description: 
 email: deepak.jois@gmail.com
 executables: 
@@ -51,6 +81,7 @@ extensions:
 extra_rdoc_files: []
 
 files: 
+- CONTRIBUTORS
 - FIX.md
 - LICENSE.txt
 - README.md
@@ -65,9 +96,7 @@ files:
 - ext/player.c
 - ext/query.c
 - lib/dhun.rb
-- lib/dhun/command.rb
-- lib/dhun/controller.rb
-- lib/dhun/dhun_client.rb
+- lib/dhun/client.rb
 - lib/dhun/dhun_server.rb
 - lib/dhun/handler.rb
 - lib/dhun/logger.rb

data/lib/dhun/command.rb

@@ -1,15 +0,0 @@
-require 'json'
-module Dhun
-  class Command
-    attr_reader :commands, :arguments
-    
-    def initialize(command,arguments)
-      @command = command
-      @arguments = arguments
-    end
-    
-    def to_json
-      { "command" => @command, "arguments" => @arguments }.to_json
-    end
-  end
-end

data/lib/dhun/controller.rb

@@ -1,160 +0,0 @@
-require 'json'
-module Dhun
-  class Controller
-
-    attr_accessor :options,:logger
-
-    def initialize(options)
-      @options = options
-      @logger = Logger.instance
-    end
-
-    def start
-      server = Server.new(@options)
-      if DhunClient.is_dhun_server_running?(@options[:socket])
-        puts "Dhun is already running"
-      else
-        server.start
-      end
-    end
-
-    def stop
-      send_command("stop")
-    end
-
-    def query(*args)
-      abort_if_empty_args(args)
-      q = Query.new(args)
-      if q.is_valid?
-        files = q.execute_spotlight_query
-        puts(files.empty? ? "No Results Found" : "#{files.size} Results\n" + files.join("\n"))
-      else
-        puts "Invalid Query Syntax. Run dhun -h to see right syntax"
-      end
-    end
-
-    def play(*args)
-      abort_if_empty_args(args)
-      resp = get_json_response("play", args)
-      return unless resp
-      # Process response
-      case resp.success?
-      when true
-        puts resp[:message]
-        # Print list of files
-        print_list resp[:files]
-      else
-        puts resp[:message]
-      end
-    end
-
-    def enqueue(*args)
-      abort_if_empty_args(args)
-      resp = get_json_response("enqueue",args)
-      return unless resp
-      # Process response
-      case resp.success?
-      when true
-        puts resp[:message]
-        # Print list of files
-        print_list resp[:files]
-      else
-        puts resp[:message]
-      end
-    end
-
-    def status
-      resp = get_json_response("status")
-      return unless resp
-      puts resp[:message]
-      if resp.success?
-        now_playing = resp[:now_playing]
-        queue = resp[:queue]
-        puts "Now playing #{now_playing}" if now_playing
-        if queue.empty?
-          puts "Queue is empty"
-        else
-          print_list(queue)
-        end
-      end
-    end
-
-    def history
-      resp = get_json_response("history")
-      return unless resp
-      puts resp[:message]
-      print_list(resp[:history]) unless resp[:history].empty?
-    end
-
-    def next(skip_length=1)
-      begin
-        skip_length = Integer(skip_length)
-      rescue ArgumentError => ex # Not a valid integer
-        abort ex.message
-      end
-      resp = get_json_response("next",[skip_length])
-      puts resp[:message] if resp
-    end
-
-    def prev(skip_length=1)
-      begin
-        skip_length = Integer(skip_length)
-      rescue ArgumentError => ex # Not a valid integer
-        abort ex.message
-      end
-      resp = get_json_response("prev",[skip_length])
-      puts resp[:message] if resp
-    end
-
-
-    def pause
-      resp = get_json_response("pause")
-      puts resp[:message] if resp
-    end
-
-    def resume
-      resp = get_json_response("resume")
-      puts resp[:message] if resp
-    end
-
-    def shuffle
-      resp = get_json_response("shuffle")
-      return unless resp
-      # Process response
-      case resp.success?
-      when true
-        puts resp[:message]
-        # Print list of files
-        print_list resp[:queue]
-      else
-        puts resp[:message]
-      end
-    end
-
-    protected
-    def send_command(command,arguments=[])
-      cmd = { "command" => command, "arguments" => arguments }.to_json
-      client = DhunClient.new(@options)
-      resp = client.send(cmd)
-    end
-
-    def get_json_response(command,args=[])
-      begin
-         resp = send_command(command,args)
-         return Result.from_json_str(resp)
-      rescue
-        puts "Invalid Response From Server"
-        logger.debug $!
-        return nil
-      end
-    end
-
-    def abort_if_empty_args(args)
-      abort "You must pass in atleast one argument" if args.empty?
-    end
-
-    def print_list(list)
-      list.each { |item| puts item }
-    end
-  end
-end

data/lib/dhun/dhun_client.rb

@@ -1,30 +0,0 @@
-require 'socket'
-require 'json'
-module Dhun
-  class DhunClient
-    def initialize(options)
-      @options = options
-      @socket = options[:socket]
-      unless DhunClient.is_dhun_server_running?(@socket)
-        raise "Dhun server is not running"
-      end
-    end
-
-    def send(message)
-      u = UNIXSocket.new(@socket)
-      u.puts message
-      resp = u.read
-      u.close
-      return resp
-    end
-
-    def self.is_dhun_server_running?(socket)
-      begin
-        u = UNIXSocket.new(socket)
-        return true
-      rescue StandardError => ex
-        return false
-      end
-    end
-  end
-end