eatmysoul 0.0.2 → 0.1.0

data/README.rdoc

@@ -24,7 +24,7 @@ client, but i was wanting to implement one for some times, so i did.
 
 == Usage
 
- rubyxxx eatmysoul.rb [config_file]
+ eatmysoul [run|start|stop] -- [--config-file=/path] [--login=login_x] [--location==loc]
 
 * Run it once (e.g. ruby1.8 eatmysoul.rb), and it will produce a template configuration file (defaults to '~/.eatmysoul.yml')
 * Edit this file. (especially the login and password)

data/TODO.rdoc

@@ -0,0 +1,4 @@
+# Todo file for eatmysoul
+
+ * Implement an install mode, which can install eatmysoul on linux server (init scripts and stuffs)
+

data/bin/eatmysoul

@@ -31,12 +31,12 @@
 # ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
+require 'daemons'
 require 'eatmysoul'
 
-o = EatMySoul::Settings.new ARGV[0] if ARGV.length >= 1
-o = EatMySoul::Settings.new unless ARGV.length >= 1
-
-Process.daemon if o.daemon == "true" or o.daemon == "yes"
-Signal.trap("PIPE") { EatMySoul.connect_loop o }
-EatMySoul.connect_loop(o)
+Daemons.run_proc ('eatmysoul') do
+  o = EatMySoul::Settings.new
+  Signal.trap("PIPE") { EatMySoul.connect_loop o }
+  EatMySoul.connect_loop(o)
+end
 

data/eatmysoul.gemspec

@@ -21,4 +21,5 @@ Gem::Specification.new do |s|
   # specify any dependencies here; for example:
   # s.add_development_dependency "rspec"
   s.add_runtime_dependency "eventmachine"
+  s.add_runtime_dependency "daemons"
 end

data/lib/eatmysoul/version.rb

@@ -1,3 +1,3 @@
 module Eatmysoul
-  VERSION = "0.0.2"
+  VERSION = "0.1.0"
 end

data/lib/eatmysoul.rb

@@ -43,25 +43,33 @@ module EatMySoul
 
   class Settings
     # edit the next line to change the default path
-    def initialize(path = "#{ENV['HOME']}/.eatmysoul.yml")
-      path = "/etc/eatmysoul.yml" if `id` =~ /root/
-      @options = {
-        :server => "ns-server.epita.fr",
-        :port => 4242,
-        :daemon => false,
-        :login => "login_x",
-        :passwd => "pwd_socks",
-        :logfile => "STDOUT",
-        :loglevel => "WARN",
-        :location => "somewhere",
-        :status => "chatless client"
-      }
-
+    def initialize()
       begin
+        @options = {
+          :server => "ns-server.epita.fr",
+          :port => 4242,
+          :login => "login_x",
+          :passwd => "pwd_socks",
+          :logfile => "STDOUT",
+          :loglevel => "WARN",
+          :location => "somewhere",
+          :status => "chatless client"
+        }
+
+        parser = Trollop::Parser.new
+        parser.opt(:config_file, "Configuration file path",
+                   :default => (if `id` =~ /root/ then "/etc/eatmysoul.yml"
+                                else "#{ENV['HOME']}/.eatmysoul.yml" end))
+        @options.each { |k,v| parser.opt(k, k.to_s, :type => :string) }
+        cli_opts = parser.parse.delete_if { |k,v| not v or k =~ /_given/ }
+        puts cli_opts
+        path = cli_opts.delete :config_file
+
         if File.exists? path
           yaml = YAML::load_file(path)
           @options.merge! yaml
         end
+        @options.merge! cli_opts
 
         save path
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eatmysoul
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &12060440 !ruby/object:Gem::Requirement
+  requirement: &21474680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,18 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *12060440
+  version_requirements: *21474680
+- !ruby/object:Gem::Dependency
+  name: daemons
+  requirement: &21474260 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *21474260
 description: A simple netsoul (epitech's internal network protocol) client, mainly
   targeting servers
 email:
@@ -36,6 +47,7 @@ files:
 - Gemfile.lock
 - README.rdoc
 - Rakefile
+- TODO.rdoc
 - bin/eatmysoul
 - eatmysoul.gemspec
 - lib/eatmysoul.rb