phper 0.6.1 → 0.7.0

data/Gemfile

@@ -9,7 +9,7 @@ gem 'command-line-utils' , '>= 0.0.1'
 gem 'launchy'
 gem 'json'
 gem 'rdoc'
-
+ 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do

data/README.md

@@ -50,7 +50,8 @@ Usage
 * files:get
 * files:modified
 * files:modified:get
-
+* logs
+* logs:tail
 Contributing to phper
 ---------------------
 
@@ -65,5 +66,7 @@ Contributing to phper
 Copyright
 ---------
 
-Copyright (c) 2011 Yoshihiro TAKAHARA. See LICENSE.txt for further details.
+Copyright (c) 2011-2012 Yoshihiro TAKAHARA. See LICENSE.txt for further details.
+
+[![endorse](http://api.coderwall.com/tumf/endorsecount.png)](http://coderwall.com/tumf)
 

data/VERSION

@@ -1 +1 @@
-0.6.1
+0.7.0

data/lib/phper/commands.rb

@@ -594,11 +594,8 @@ EOF
 
   def logs
     project = nil
-    server = nil
+    # server = nil
     OptionParser.new { |opt|
-      opt.on('-s SERVER','--server=SERVER', 'server') { |v|
-        server = v
-      }
       @summery = "list logs"
       @banner = ""
       project = extract_project(opt)
@@ -610,28 +607,26 @@ EOF
     servers = @agent.servers(project)
     raise "project #{project} has no servers." if servers.length == 0
 
-    if server
-      servers.find { |s| s["server"]["name"] =~ /^#{server}/ }
-    else
-      server = servers.first if servers.length == 1
-    end
-    raise "server is not specified." unless server
-
-    puts "-----> #{server['server']['name']}"
-    @agent.logs(project,server).each { |log|
-      puts log
+    servers.each { |server|
+      puts "-----> #{server['server']['name']}"
+      @agent.logs(project,server).each { |log|
+        puts log
+      }
     }
   end
 
   def logs_tail
     project = nil
     server = nil
+    name = nil
     OptionParser.new { |opt|
       opt.on('-s SERVER','--server=SERVER', 'server') { |v|
         server = v
       }
+      opt.on('-n NAME','--name=NAME', 'log name') { |v|
+        name = v
+      }
       @summery = "list logs"
-      @banner = ""
       project = extract_project(opt)
       return opt if @help
     }
@@ -642,16 +637,22 @@ EOF
     raise "project #{project} has no servers." if servers.length == 0
 
     if server
-      servers.find { |s| s["server"]["name"] =~ /^#{server}/ }
-    else
-      server = servers.first if servers.length == 1
+      server = servers.find { |s| s["server"]["name"] =~ /^#{server}/ }
+      raise "server is not specified." unless server
     end
-    raise "server is not specified." unless server
-    name = @command_options.shift
-    name ||= "access"
 
-    puts "-----> #{server['server']['name']}"
-    puts @agent.logs_tail(project,server,name)["log"]
+    servers = [server] if server
+    servers.each { |server|
+      names = @agent.logs(project,server)
+      if name
+        raise "#{server["server"]["name"]} has no log:#{name}." unless names.include?(name)
+        names = [name]
+      end
+      names.each { |name|
+        puts "-----> log:#{name} #{server["server"]["name"]}"
+        puts @agent.logs_tail(project,server,name)["log"]
+      }
+    }
   end
 
 end

data/phper.gemspec

@@ -4,15 +4,15 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{phper}
-  s.version = "0.6.1"
+  s.name = "phper"
+  s.version = "0.7.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = [%q{Yoshihiro TAKAHARA}]
-  s.date = %q{2011-10-16}
-  s.description = %q{phper}
-  s.email = %q{y.takahara@gmail.com}
-  s.executables = [%q{phper}]
+  s.authors = ["Yoshihiro TAKAHARA"]
+  s.date = "2012-03-17"
+  s.description = "phper"
+  s.email = "y.takahara@gmail.com"
+  s.executables = ["phper"]
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.md"
@@ -33,11 +33,11 @@ Gem::Specification.new do |s|
     "test/helper.rb",
     "test/test_phper.rb"
   ]
-  s.homepage = %q{http://github.com/tumf/phper}
-  s.licenses = [%q{MIT}]
-  s.require_paths = [%q{lib}]
-  s.rubygems_version = %q{1.8.6}
-  s.summary = %q{phper}
+  s.homepage = "http://github.com/tumf/phper"
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.12"
+  s.summary = "phper"
   s.test_files = [
     "test/helper.rb",
     "test/test_phper.rb"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: phper
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: 
   segments: 
   - 0
-  - 6
-  - 1
-  version: 0.6.1
+  - 7
+  - 0
+  version: 0.7.0
 platform: ruby
 authors: 
 - Yoshihiro TAKAHARA
@@ -15,10 +15,9 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-16 00:00:00 Z
+date: 2012-03-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :runtime
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -28,11 +27,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id001
+  type: :runtime
   name: rest-client
   prerelease: false
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  type: :runtime
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -43,11 +42,11 @@ dependencies:
         - 0
         - 1
         version: "0.1"
-  version_requirements: *id002
+  type: :runtime
   name: keystorage
   prerelease: false
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  type: :runtime
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -58,11 +57,11 @@ dependencies:
         - 1
         - 6
         version: "1.6"
-  version_requirements: *id003
+  type: :runtime
   name: highline
   prerelease: false
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  type: :runtime
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -74,11 +73,11 @@ dependencies:
         - 0
         - 1
         version: 0.0.1
-  version_requirements: *id004
+  type: :runtime
   name: command-line-utils
   prerelease: false
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  type: :runtime
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -88,11 +87,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id005
+  type: :runtime
   name: launchy
   prerelease: false
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  type: :runtime
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -102,11 +101,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id006
+  type: :runtime
   name: json
   prerelease: false
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  type: :runtime
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -116,11 +115,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id007
+  type: :runtime
   name: rdoc
   prerelease: false
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  type: :development
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -130,11 +129,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id008
+  type: :development
   name: shoulda
   prerelease: false
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  type: :development
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -146,11 +145,11 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  version_requirements: *id009
+  type: :development
   name: bundler
   prerelease: false
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  type: :development
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -162,11 +161,11 @@ dependencies:
         - 5
         - 2
         version: 1.5.2
-  version_requirements: *id010
+  type: :development
   name: jeweler
   prerelease: false
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
-  type: :development
   requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -176,11 +175,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id011
+  type: :development
   name: rcov
   prerelease: false
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
-  type: :development
   requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -190,9 +189,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id012
+  type: :development
   name: mocha
   prerelease: false
+  version_requirements: *id012
 description: phper
 email: y.takahara@gmail.com
 executables: 
@@ -246,7 +246,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.12
 signing_key: 
 specification_version: 3
 summary: phper