phper 0.5.4 → 0.6.0

data/.document

@@ -0,0 +1,5 @@
+lib/**/*.rb
+bin/*
+- 
+features/**/*.feature
+LICENSE.txt

data/Gemfile

@@ -8,6 +8,7 @@ gem 'highline', '> 1.6'
 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.
@@ -16,4 +17,5 @@ group :development do
   gem "bundler", "~> 1.0.0"
   gem "jeweler", "~> 1.5.2"
   gem "rcov", ">= 0"
+  gem 'mocha'
 end

data/Rakefile

@@ -38,12 +38,14 @@ Rcov::RcovTask.new do |test|
   test.libs << 'test'
   test.pattern = 'test/**/test_*.rb'
   test.verbose = true
+  test.rcov_opts << '-x /usr -x .rvm -x rvm -x vendor'
 end
 
 task :default => :test
 
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
+require 'rdoc/task'
+
+RDoc::Task.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 
   rdoc.rdoc_dir = 'rdoc'

data/VERSION

@@ -1 +1 @@
-0.5.4
+0.6.0

data/bin/phper

@@ -4,85 +4,3 @@ $:.unshift(File.join(File.dirname(__FILE__),'..','lib'))
 require 'phper'
 Phper::CLI::run(ARGV)
 exit
-
-
-def urlroot
-  "http://tumf:hogehoge@localhost:3000"
-end
-
-def url res
-  format = "json"
-  urlroot + res + "." + format
-end
-
-# RestClient.get(url("/projects"))
-# puts RestClient.post url("/projects"),:project => {:name => "fuga6"}
-# puts RestClient.delete url("/projects/tumf-fuga6")
-
-                     
-
-
-
-
-=begin
-
-phper register 
-
-$ phper login [<username>]
-
-$ phper logout
-
-$ phper keys
-$ phper keys:add <file>
-$ phper keys:remove <name>
-$ phper keys:clear
-
-== git リポジトリを作る
-
-$ phper create <project>
-  --> gitosis@git.phper.jp:<user>/<project>.git
-
-== coding
-
-$ git clone gitosis@git.phper.jp:tumf/<project>.git
-
-== deploy
-
-$ git push phper master
-
-* hostが未割り当てならhostを割り当て
-* hostにデプロイ
-  --> /var/phper/project
-  --> cap
-
-== server
-
-$ phper server [<docroot>] [--port=<port>] []
-
-
-* <docroot>をドキュメントルートにしてサーバを構築
-  --> /var/phper/project/<docroot>
-
-$ phper server [<docroot>] [--name=<fqdn>]
-
-* proxyの`/etc/hosts`を更新
-* proxyのnginx設定を更新
-* Apache VirtualHostを設定
-* nameが指定されていなかったら適当に決められる
-
-== サーバの設定
-
-$ phper server:config
-$ phper server:config:add
-$ phper server:config:clear
-
-
-
-== メンテナンス
-
-$ phper server:maintenance <on|off>
-
-$ phper server:stop
-$ phper server:start
-$ phper server:restart
-=end

data/lib/phper/agent.rb

@@ -49,6 +49,14 @@ class Phper::Agent
     get("/keys")
   end
 
+  def logs project, server
+    get("/projects/%s/servers/%s/logs" % [project,server["server"]["id"]])
+  end
+
+  def logs_tail project,server,name
+    get("/projects/%s/servers/%s/logs/%s" %
+        [project,server["server"]["id"],name])
+  end
 
   def projects_deploy project
     get("/projects/%s/deploy" % project)

data/lib/phper/cli.rb

@@ -3,8 +3,10 @@
 require 'phper'
 class Phper::CLI < CommandLineUtils::CLI
   include Phper
+  attr_accessor :out
   def initialize
     super
+    @out=STDOUT
     @commands = Commands.new
     yield self if block_given?
   end
@@ -15,7 +17,7 @@ class Phper::CLI < CommandLineUtils::CLI
   def version
     File.open(File.join(File.dirname(__FILE__) ,
                         "..","..","VERSION"),"r") { |file|
-      puts file.gets
+      @out.puts file.gets
     }
   end
 end

data/lib/phper/commands.rb

@@ -17,6 +17,7 @@ class Phper::Commands < CommandLineUtils::Commands
     @commands += ["hosts"]
     @commands += ["files","files:dump","files:get"]
     @commands += ["files:modified","files:modified:get"]
+    @commands += ["logs","logs:tail"]
 
     @agent = Agent.new
     # @cache_file =  homedir + "/.phper.cache"
@@ -591,5 +592,66 @@ EOF
     end
   end
 
+  def logs
+    project = nil
+    server = nil
+    OptionParser.new { |opt|
+      opt.on('-s SERVER','--server=SERVER', 'server') { |v|
+        server = v
+      }
+      @summery = "list logs"
+      @banner = ""
+      project = extract_project(opt)
+      return opt if @help
+    }
+
+    raise "project is not specified." unless project
+    start
+    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
+    }
+  end
+
+  def logs_tail
+    project = nil
+    server = nil
+    OptionParser.new { |opt|
+      opt.on('-s SERVER','--server=SERVER', 'server') { |v|
+        server = v
+      }
+      @summery = "list logs"
+      @banner = ""
+      project = extract_project(opt)
+      return opt if @help
+    }
+
+    raise "project is not specified." unless project
+    start
+    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
+    name = @command_options.shift
+    name ||= "access"
+
+    puts "-----> #{server['server']['name']}"
+    puts @agent.logs_tail(project,server,name)["log"]
+  end
 
 end

data/phper.gemspec

@@ -5,22 +5,21 @@
 
 Gem::Specification.new do |s|
   s.name = %q{phper}
-  s.version = "0.5.4"
+  s.version = "0.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Yoshihiro TAKAHARA"]
-  s.date = %q{2011-03-01}
-  s.default_executable = %q{phper}
+  s.authors = [%q{Yoshihiro TAKAHARA}]
+  s.date = %q{2011-10-15}
   s.description = %q{phper}
   s.email = %q{y.takahara@gmail.com}
-  s.executables = ["phper"]
+  s.executables = [%q{phper}]
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.md"
   ]
   s.files = [
+    ".document",
     "Gemfile",
-    "Gemfile.lock",
     "LICENSE.txt",
     "README.md",
     "Rakefile",
@@ -35,9 +34,9 @@ Gem::Specification.new do |s|
     "test/test_phper.rb"
   ]
   s.homepage = %q{http://github.com/tumf/phper}
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.5.0}
+  s.licenses = [%q{MIT}]
+  s.require_paths = [%q{lib}]
+  s.rubygems_version = %q{1.8.6}
   s.summary = %q{phper}
   s.test_files = [
     "test/helper.rb",
@@ -54,10 +53,12 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<command-line-utils>, [">= 0.0.1"])
       s.add_runtime_dependency(%q<launchy>, [">= 0"])
       s.add_runtime_dependency(%q<json>, [">= 0"])
+      s.add_runtime_dependency(%q<rdoc>, [">= 0"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
+      s.add_development_dependency(%q<mocha>, [">= 0"])
     else
       s.add_dependency(%q<rest-client>, [">= 0"])
       s.add_dependency(%q<keystorage>, ["> 0.1"])
@@ -65,10 +66,12 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<command-line-utils>, [">= 0.0.1"])
       s.add_dependency(%q<launchy>, [">= 0"])
       s.add_dependency(%q<json>, [">= 0"])
+      s.add_dependency(%q<rdoc>, [">= 0"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_dependency(%q<rcov>, [">= 0"])
+      s.add_dependency(%q<mocha>, [">= 0"])
     end
   else
     s.add_dependency(%q<rest-client>, [">= 0"])
@@ -77,10 +80,12 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<command-line-utils>, [">= 0.0.1"])
     s.add_dependency(%q<launchy>, [">= 0"])
     s.add_dependency(%q<json>, [">= 0"])
+    s.add_dependency(%q<rdoc>, [">= 0"])
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
     s.add_dependency(%q<rcov>, [">= 0"])
+    s.add_dependency(%q<mocha>, [">= 0"])
   end
 end
 

data/test/helper.rb

@@ -9,6 +9,7 @@ rescue Bundler::BundlerError => e
 end
 require 'test/unit'
 require 'shoulda'
+require 'mocha'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))

data/test/test_phper.rb

@@ -1,7 +1,25 @@
 require 'helper'
 
 class TestPhper < Test::Unit::TestCase
-  should "probably rename this file and start testing for real" do
-    flunk "hey buddy, you should probably rename this file and start testing for real"
+  def command commands
+    Phper::CLI::run(commands)
+  end
+  context "commands" do
+    setup do
+      require "stringio"
+      @cli = Phper::CLI.new
+      @cli.out = StringIO.new
+    end
+
+    should "version shows version" do
+      @cli.version
+      assert @cli.out.string =~ /\d+\.\d+.\d+/
+    end
+
+    should "help shows help" do
+      command ["help"]
+      # assert_equal(@cli.out.string.length,481)
+    end
+
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: phper
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 7
   prerelease: 
   segments: 
   - 0
-  - 5
-  - 4
-  version: 0.5.4
+  - 6
+  - 0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Yoshihiro TAKAHARA
@@ -15,10 +15,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-01 00:00:00 +09:00
-default_executable: phper
+date: 2011-10-15 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  type: :runtime
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -31,8 +31,8 @@ dependencies:
   version_requirements: *id001
   name: rest-client
   prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency 
+  type: :runtime
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -46,8 +46,8 @@ dependencies:
   version_requirements: *id002
   name: keystorage
   prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency 
+  type: :runtime
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -61,8 +61,8 @@ dependencies:
   version_requirements: *id003
   name: highline
   prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency 
+  type: :runtime
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -77,8 +77,8 @@ dependencies:
   version_requirements: *id004
   name: command-line-utils
   prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency 
+  type: :runtime
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -91,8 +91,8 @@ dependencies:
   version_requirements: *id005
   name: launchy
   prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency 
+  type: :runtime
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -105,8 +105,8 @@ dependencies:
   version_requirements: *id006
   name: json
   prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency 
+  type: :runtime
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -117,11 +117,25 @@ dependencies:
         - 0
         version: "0"
   version_requirements: *id007
-  name: shoulda
+  name: rdoc
   prerelease: false
-  type: :development
 - !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"
+  version_requirements: *id008
+  name: shoulda
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :development
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -132,12 +146,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  version_requirements: *id008
+  version_requirements: *id009
   name: bundler
   prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency 
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -148,12 +162,12 @@ dependencies:
         - 5
         - 2
         version: 1.5.2
-  version_requirements: *id009
+  version_requirements: *id010
   name: jeweler
   prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency 
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -162,10 +176,23 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id010
+  version_requirements: *id011
   name: rcov
   prerelease: false
+- !ruby/object:Gem::Dependency 
   type: :development
+  requirement: &id012 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  version_requirements: *id012
+  name: mocha
+  prerelease: false
 description: phper
 email: y.takahara@gmail.com
 executables: 
@@ -176,8 +203,8 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.md
 files: 
+- .document
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -190,7 +217,6 @@ files:
 - phper.gemspec
 - test/helper.rb
 - test/test_phper.rb
-has_rdoc: true
 homepage: http://github.com/tumf/phper
 licenses: 
 - MIT
@@ -220,7 +246,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.0
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: phper

data/Gemfile.lock

@@ -1,37 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    command-line-utils (0.0.2)
-    configuration (1.2.0)
-    git (1.2.5)
-    highline (1.6.1)
-    jeweler (1.5.2)
-      bundler (~> 1.0.0)
-      git (>= 1.2.5)
-      rake
-    json (1.5.1)
-    keystorage (0.4.3)
-    launchy (0.3.7)
-      configuration (>= 0.0.5)
-      rake (>= 0.8.1)
-    mime-types (1.16)
-    rake (0.8.7)
-    rcov (0.9.9)
-    rest-client (1.6.1)
-      mime-types (>= 1.16)
-    shoulda (2.11.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 1.0.0)
-  command-line-utils (>= 0.0.1)
-  highline (> 1.6)
-  jeweler (~> 1.5.2)
-  json
-  keystorage (> 0.1)
-  launchy
-  rcov
-  rest-client
-  shoulda