freyr 0.3.2 → 0.3.3

data/.rvmrc

@@ -0,0 +1,41 @@
+#!/usr/bin/env bash
+
+# This is an RVM Project .rvmrc file, used to automatically load the ruby
+# development environment upon cd'ing into the directory
+
+# First we specify our desired <ruby>[@<gemset>], the @gemset name is optional.
+environment_id="ree-1.8.7-2011.03@freyr"
+
+#
+# First we attempt to load the desired environment directly from the environment
+# file. This is very fast and efficicent compared to running through the entire
+# CLI and selector. If you want feedback on which environment was used then
+# insert the word 'use' after --create as this triggers verbose mode.
+#
+if [[ -d "${rvm_path:-$HOME/.rvm}/environments" \
+  && -s "${rvm_path:-$HOME/.rvm}/environments/$environment_id" ]]
+then
+  \. "${rvm_path:-$HOME/.rvm}/environments/$environment_id"
+
+  if [[ -s ".rvm/hooks/after_use" ]]
+  then
+    . ".rvm/hooks/after_use"
+  fi
+else
+  # If the environment file has not yet been created, use the RVM CLI to select.
+  if ! rvm --create use  "$environment_id"
+  then
+    echo "Failed to create RVM environment ''."
+  fi
+fi
+
+#
+# If you use an RVM gemset file to install a list of gems (*.gems), you can have
+# it be automatically loaded. Uncomment the following and adjust the filename if
+# necessary.
+#
+# filename=".gems"
+# if [[ -s "$filename" ]] ; then
+#   rvm gemset import "$filename" | grep -v already | grep -v listed | grep -v complete | sed '/^$/d'
+# fi
+

data/Gemfile

@@ -0,0 +1,3 @@
+source "http://rubygems.org"
+
+gemspec

data/Gemfile.lock

@@ -0,0 +1,35 @@
+PATH
+  remote: .
+  specs:
+    freyr (0.3.2)
+      thor (>= 0.10)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    diff-lcs (1.1.2)
+    git (1.2.5)
+    jeweler (1.6.2)
+      bundler (~> 1.0)
+      git (>= 1.2.5)
+      rake
+    rake (0.9.2)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.4)
+    rspec-expectations (2.6.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.6.0)
+    thor (0.14.6)
+    yard (0.7.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  freyr!
+  jeweler
+  rspec (>= 1.2.9)
+  yard

data/Rakefile

@@ -12,7 +12,6 @@ begin
     gem.authors = ["Tal Atlas"]
     gem.add_development_dependency "rspec", ">= 1.2.9"
     gem.add_development_dependency "yard", ">= 0"
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
     gem.add_dependency 'thor', ">= 0.10"
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.3.2
+0.3.3

data/freyr.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{freyr}
-  s.version = "0.3.2"
+  s.version = "0.3.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tal Atlas"]
-  s.date = %q{2011-06-09}
+  s.date = %q{2011-06-15}
   s.default_executable = %q{freyr}
   s.description = %q{Define all services you need to run and this will launch,daemonize,and monitor them for you.}
   s.email = %q{me@tal.by}
@@ -21,7 +21,10 @@ Gem::Specification.new do |s|
   s.files = [
     ".document",
     ".irbrc",
+    ".rvmrc",
     "Freyrfile",
+    "Gemfile",
+    "Gemfile.lock",
     "LICENSE",
     "README.markdown",
     "Rakefile",
@@ -36,6 +39,8 @@ Gem::Specification.new do |s|
     "lib/freyr/cli/monitor.rb",
     "lib/freyr/command.rb",
     "lib/freyr/pinger.rb",
+    "lib/freyr/process_info.rb",
+    "lib/freyr/process_info_list.rb",
     "lib/freyr/service.rb",
     "lib/freyr/service_group.rb",
     "lib/freyr/service_info.rb",
@@ -45,26 +50,52 @@ Gem::Specification.new do |s|
   ]
   s.homepage = %q{http://github.com/Talby/freyr}
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.5.0}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{Service manager and runner}
-  s.test_files = [
-    "spec/freyr_spec.rb",
-    "spec/spec_helper.rb"
-  ]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<freyr>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_development_dependency(%q<yard>, [">= 0"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_development_dependency(%q<yard>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_development_dependency(%q<yard>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_development_dependency(%q<yard>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
       s.add_development_dependency(%q<yard>, [">= 0"])
       s.add_runtime_dependency(%q<thor>, [">= 0.10"])
     else
+      s.add_dependency(%q<freyr>, [">= 0"])
+      s.add_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_dependency(%q<yard>, [">= 0"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
+      s.add_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_dependency(%q<yard>, [">= 0"])
+      s.add_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_dependency(%q<yard>, [">= 0"])
+      s.add_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_dependency(%q<yard>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 1.2.9"])
       s.add_dependency(%q<yard>, [">= 0"])
       s.add_dependency(%q<thor>, [">= 0.10"])
     end
   else
+    s.add_dependency(%q<freyr>, [">= 0"])
+    s.add_dependency(%q<rspec>, [">= 1.2.9"])
+    s.add_dependency(%q<yard>, [">= 0"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
+    s.add_dependency(%q<rspec>, [">= 1.2.9"])
+    s.add_dependency(%q<yard>, [">= 0"])
+    s.add_dependency(%q<rspec>, [">= 1.2.9"])
+    s.add_dependency(%q<yard>, [">= 0"])
+    s.add_dependency(%q<rspec>, [">= 1.2.9"])
+    s.add_dependency(%q<yard>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 1.2.9"])
     s.add_dependency(%q<yard>, [">= 0"])
     s.add_dependency(%q<thor>, [">= 0.10"])

data/lib/freyr/cli/helpers.rb

@@ -79,6 +79,19 @@ module Freyr
           str << ' '*'(123)'.size
         end
         
+        if args[:procinfo]
+          begin
+            @proc_list ||= ProcessInfoList.new
+          
+            pid = s.command.pid
+          
+            proc = @proc_list[pid.to_i]
+          
+            str << " CPU: #{proc.cpu}% - MEM: #{proc.mem}%" if proc
+          rescue => e
+          end
+        end
+        
         str << "\n" #if str =~ /\s$/ # Thor's display only adds a new line if the last char isn't a space
         
         strs << str

data/lib/freyr/cli/monitor.rb

@@ -3,8 +3,9 @@ module Freyr
     
     desc 'list', 'lists all available services:'
     method_option :ping, :type => :boolean, :default => false, :aliases => '-p', :desc => 'also ping each service which can ping'
+    method_option :info, :type => :boolean, :default => false, :aliases => '-i', :desc => 'also get cpu and memory info'
     def list
-      strs = list_all_services(:ping => options.ping?)
+      strs = list_all_services(:ping => options.ping?, :procinfo => options.info?)
       
       if strs.empty?
         say "No services available", :red

data/lib/freyr/process_info.rb

@@ -0,0 +1,5 @@
+module Freyr
+  class ProcessInfo
+    attr_accessor :user, :pid, :cpu, :mem, :vsz, :rss, :tt, :stat, :started, :time, :cmd
+  end
+end

data/lib/freyr/process_info_list.rb

@@ -0,0 +1,32 @@
+module Freyr
+  class ProcessInfoList
+    def initialize
+      ps = `ps aux`.chomp.split("\n")
+      ps.shift
+      
+      @processes = {}
+      ps.each do |proc|
+        proc = proc.split(/\s+/)
+        p = ProcessInfo.new
+        p.user = proc.shift
+        p.pid  = proc.shift
+        p.cpu  = proc.shift
+        p.mem  = proc.shift
+        p.vsz  = proc.shift
+        p.rss  = proc.shift
+        p.tt   = proc.shift
+        p.stat = proc.shift
+        p.started = proc.shift
+        p.time = proc.shift
+        p.cmd  = proc.join(' ')
+        
+        @processes[p.pid.to_i] = p
+      end
+    end
+    
+    def [] pid
+      @processes[pid.to_i]
+    end
+    
+  end
+end

data/lib/freyr.rb

@@ -4,6 +4,6 @@ module Freyr
   VERSION = File.open(File.expand_path(File.dirname(__FILE__)+'/../VERSION')).read
 end
 
-%w{service_info service_group service command pinger}.each do |f|
+%w{service_info service_group service command pinger process_info process_info_list}.each do |f|
   require File.expand_path(File.dirname(__FILE__)+"/freyr/#{f}.rb")
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: freyr
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 3
-  - 2
-  version: 0.3.2
+  - 3
+  version: 0.3.3
 platform: ruby
 authors: 
 - Tal Atlas
@@ -15,13 +15,70 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-09 00:00:00 -04:00
+date: 2011-06-15 00:00:00 -04:00
 default_executable: freyr
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  type: :runtime
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: freyr
+  version_requirements: *id001
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :development
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 1
+        - 2
+        - 9
+        version: 1.2.9
   name: rspec
+  version_requirements: *id002
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  type: :development
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: yard
+  version_requirements: *id003
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :development
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: jeweler
+  version_requirements: *id004
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :development
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -32,12 +89,72 @@ dependencies:
         - 2
         - 9
         version: 1.2.9
+  name: rspec
+  version_requirements: *id005
+  prerelease: false
+- !ruby/object:Gem::Dependency 
   type: :development
-  version_requirements: *id001
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: yard
+  version_requirements: *id006
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :development
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 1
+        - 2
+        - 9
+        version: 1.2.9
+  name: rspec
+  version_requirements: *id007
+  prerelease: false
 - !ruby/object:Gem::Dependency 
+  type: :development
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   name: yard
+  version_requirements: *id008
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  type: :development
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 1
+        - 2
+        - 9
+        version: 1.2.9
+  name: rspec
+  version_requirements: *id009
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :development
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -46,12 +163,42 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  name: yard
+  version_requirements: *id010
+  prerelease: false
+- !ruby/object:Gem::Dependency 
   type: :development
-  version_requirements: *id002
+  requirement: &id011 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 1
+        - 2
+        - 9
+        version: 1.2.9
+  name: rspec
+  version_requirements: *id011
+  prerelease: false
 - !ruby/object:Gem::Dependency 
-  name: thor
+  type: :development
+  requirement: &id012 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: yard
+  version_requirements: *id012
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  type: :runtime
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -61,8 +208,9 @@ dependencies:
         - 0
         - 10
         version: "0.10"
-  type: :runtime
-  version_requirements: *id003
+  name: thor
+  version_requirements: *id013
+  prerelease: false
 description: Define all services you need to run and this will launch,daemonize,and monitor them for you.
 email: me@tal.by
 executables: 
@@ -75,7 +223,10 @@ extra_rdoc_files:
 files: 
 - .document
 - .irbrc
+- .rvmrc
 - Freyrfile
+- Gemfile
+- Gemfile.lock
 - LICENSE
 - README.markdown
 - Rakefile
@@ -90,6 +241,8 @@ files:
 - lib/freyr/cli/monitor.rb
 - lib/freyr/command.rb
 - lib/freyr/pinger.rb
+- lib/freyr/process_info.rb
+- lib/freyr/process_info_list.rb
 - lib/freyr/service.rb
 - lib/freyr/service_group.rb
 - lib/freyr/service_info.rb
@@ -126,10 +279,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.0
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Service manager and runner
-test_files: 
-- spec/freyr_spec.rb
-- spec/spec_helper.rb
+test_files: []
+