jfoundry 0.1.6 → 0.1.7

data/lib/jfoundry/v2/app.rb

@@ -129,7 +129,27 @@ module JFoundry::V2
       self.uris = [x]
     end
     alias :url= :uri=
-
+    
+    ##author:cdzhw4 date:2014-05-30
+    ##deploy app from package
+    ##step 1: upload package to cc 
+    ##step 2: staging package to droplet
+    ## black |url| url:staging log path 
+    def deploy(package_path,check_resources = true,&blk)
+      response = upload(package_path,check_resources)
+      yield response[:headers]["x-app-staging-log"] if block_given?
+    end
+    
+    ##author:cdzhw4 date:2014-05-30
+    ##Grace restart
+    def restart
+      response = @client.base.restart(@guid)
+       if response[:code].to_i !=200
+         raise response[:note]
+       end
+      response
+    end
+    
     # Stop the application.
     def stop!
       self.state = "STOPPED"
@@ -297,6 +317,7 @@ module JFoundry::V2
         @id = id
         @client = client
         @manifest = manifest
+        puts "-------->#{manifest}"
       end
 
       def inspect
@@ -313,6 +334,10 @@ module JFoundry::V2
           Time.at(@manifest[:since])
         end
       end
+      
+      def remark
+        @manifest[:remark]
+      end
 
       def debugger
         return unless @manifest[:debug_ip] and @manifest[:debug_port]

data/lib/jfoundry/v2/base.rb

@@ -27,7 +27,7 @@ module JFoundry::V2
             "application/zip")
       end
 
-      put("v2", "apps", guid, "bits", :payload => payload)
+      put("v2", "apps", guid, "bits", :payload => payload,:return_response => true)
     rescue EOFError
       retry
     end
@@ -67,7 +67,11 @@ module JFoundry::V2
           :payload => diff,
           :return_response => true)
     end
-
+    
+    def restart(guid)
+      put("v2", "apps", guid, "restart", :accept => :json)
+    end
+    
     def user_info
         get("v2", "user_info", :accept => :json)
     end

data/lib/jfoundry/version.rb

@@ -1,4 +1,4 @@
 module JFoundry # :nodoc:
   # JFoundry library version number.
-  VERSION = "0.1.6".freeze
+  VERSION = "0.1.7".freeze
 end

data/lib/test/app_test.rb

@@ -0,0 +1,62 @@
+require 'jfoundry'
+
+class AppTest
+  
+  def test_deploy()
+    app = client.apps_by_name("php_log_test").first
+    log = nil
+    app.deploy("/export/home/jfoundry/testapp/jae_php0014",false) do |url|
+      puts "------------>#{url}"
+      log = url
+    end
+    if log
+      stream_start_log_test(log)
+    end
+  end
+  
+  def stream_start_log_test(log)
+    offset =0
+    while true
+        begin
+          client.stream_url(log + "&tail&tail_offset=#{offset}") do |out|
+            offset += out.size
+            puts "###########out:#{out}"
+          end
+        rescue Timeout::Error=>ex
+           puts "info","tail app stagin log error,ex:#{ex.message}"
+        end
+    end
+    rescue JFoundry::APIError=>ex
+       puts "info","tail app stagin log error,ex:#{ex.message}"
+  end
+  
+  def test_restart()
+    app = client.apps_by_name("php_restart").first
+    response = app.restart
+    
+    while true
+      instances = app.instances
+      instances.each do |instance|
+        puts "state:#{instance.state},remark:#{instance.remark}"
+      end
+    end
+    puts "--------#{response}"
+  end
+  
+  def client()
+    @client ||= JFoundry::V2::Client.new("http://api.bw-jd-app.com","3e05c77d08a14045a0bd2ea307eb1ae9","6212b165e5b54c3cb43d20295bf03e7aPIymHVqg","2","Dashboard")
+  end
+end
+
+appTest = AppTest.new
+# appTest.test_deploy
+appTest.test_restart
+
+
+
+
+
+
+
+
+

data/vendor/errors/README.md

@@ -1,3 +1,2 @@
 # errors
-
 Shared error codes and messages for Cloud Foundry

data/vendor/errors/v2.yml

@@ -248,6 +248,16 @@
   http_code: 400
   message: "You have specified an invalid amount of memory for your application."
 
+100007:
+  name: AppLimitExceeded
+  http_code: 400
+  message: "You have exceeded your organization's app limit."
+
+100008:
+  name: RouteLimitExceeded
+  http_code: 400
+  message: "You have exceeded your organization's route limit."
+
 110001:
   name: ServicePlanInvalid
   http_code: 400
@@ -437,3 +447,49 @@
   name: ServiceBrokerUrlTaken
   http_code: 400
   message: "The service broker url is taken: %s"
+
+280001:
+  name: RequestParameterError
+  http_code: 400 
+  message: "Request parameters error"
+
+280002:
+  name: Forbidden 
+  http_code: 400 
+  message: "No authority"
+
+280003:
+  name: UserNotExist
+  http_code: 400 
+  message: "No user exist"
+
+280004:
+  name: MethodNotAllowed
+  http_code: 400 
+  message: "The method is not allowed"
+
+280005:
+  name: VerifyServerError
+  http_code: 400
+  message: "The verify server error"
+
+280005:
+  name: UnknowError
+  http_code: 400
+  message: "Unknow error"
+
+280006:
+  name: JdcUpdate
+  http_code: 400
+  message: "Please update the jdc to newest version greater than: %s"
+
+280007:
+  name: EclipseUpdate
+  http_code: 400
+  message: "Please update the eclipse-plugin to newest version greater than: %s"
+
+280008:
+  name: SoftUpdate
+  http_code: 400
+  message: "Please update the eclipse-plugin to newest version greater than: %s or update the jdc to newest version greater than: %s"
+

metadata

@@ -1,347 +1,343 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: jfoundry
-version: !ruby/object:Gem::Version 
-  hash: 23
+version: !ruby/object:Gem::Version
+  version: 0.1.7
   prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 6
-  version: 0.1.6
 platform: ruby
-authors: 
+authors:
 - Jing Dong Cloud Team
 - jae
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2014-02-18 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2014-06-06 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activemodel
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - <
-      - !ruby/object:Gem::Version 
-        hash: 55
-        segments: 
-        - 5
-        - 0
-        - 0
+      - !ruby/object:Gem::Version
         version: 5.0.0
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 29
-        segments: 
-        - 3
-        - 2
-        - 9
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.2.9
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: multi_json
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
+    - - <
+      - !ruby/object:Gem::Version
+        version: 5.0.0
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.2.9
+- !ruby/object:Gem::Dependency
+  name: multi_json
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 1
-        - 7
-        version: "1.7"
+      - !ruby/object:Gem::Version
+        version: '1.7'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: multipart-post
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.7'
+- !ruby/object:Gem::Dependency
+  name: multipart-post
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 1
-        - 1
-        version: "1.1"
+      - !ruby/object:Gem::Version
+        version: '1.1'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rubyzip
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 0
-        - 9
-        version: "0.9"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: rubyzip
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: anchorman
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: anchorman
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: factory_girl
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: factory_girl
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: gem-release
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: gem-release
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: json_pure
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: json_pure
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 1
-        - 8
-        version: "1.8"
+      - !ruby/object:Gem::Version
+        version: '1.8'
   type: :development
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.8'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 0
-        - 9
-        version: "0.9"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0.9'
   type: :development
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 2
-        - 14
-        version: "2.14"
+      - !ruby/object:Gem::Version
+        version: '2.14'
   type: :development
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: shoulda-matchers
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 5
-        - 6
+      - !ruby/object:Gem::Version
+        version: '2.14'
+- !ruby/object:Gem::Dependency
+  name: shoulda-matchers
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
         version: 1.5.6
   type: :development
-  version_requirements: *id011
-- !ruby/object:Gem::Dependency 
-  name: timecop
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 0
-        - 6
-        - 1
+      - !ruby/object:Gem::Version
+        version: 1.5.6
+- !ruby/object:Gem::Dependency
+  name: timecop
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
         version: 0.6.1
   type: :development
-  version_requirements: *id012
-- !ruby/object:Gem::Dependency 
-  name: webmock
   prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 29
-        segments: 
-        - 1
-        - 9
-        version: "1.9"
+      - !ruby/object:Gem::Version
+        version: 0.6.1
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.9'
   type: :development
-  version_requirements: *id013
-- !ruby/object:Gem::Dependency 
-  name: putsinator
   prerelease: false
-  requirement: &id014 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.9'
+- !ruby/object:Gem::Dependency
+  name: putsinator
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id014
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
-email: 
+email:
 - jae@jd.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - LICENSE
 - Rakefile
-- lib/jfoundry/baseclient.rb
-- lib/jfoundry/chatty_hash.rb
+- lib/jfoundry.rb
+- lib/cc_api_stub.rb
+- lib/tasks/gem_release.rake
+- lib/jfoundry/timer.rb
+- lib/jfoundry/upload_helpers.rb
+- lib/jfoundry/errors.rb
 - lib/jfoundry/zip.rb
-- lib/jfoundry/signature/version.rb
-- lib/jfoundry/client.rb
-- lib/jfoundry/auth_token.rb
-- lib/jfoundry/version.rb
-- lib/jfoundry/v2/app.rb
-- lib/jfoundry/v2/stack.rb
-- lib/jfoundry/v2/service.rb
-- lib/jfoundry/v2/model.rb
-- lib/jfoundry/v2/model_magic.rb
-- lib/jfoundry/v2/managed_service_instance.rb
-- lib/jfoundry/v2/service_binding.rb
-- lib/jfoundry/v2/service_plan.rb
+- lib/jfoundry/concerns/proxy_options.rb
+- lib/jfoundry/signer.rb
+- lib/jfoundry/rest_client.rb
+- lib/jfoundry/v2/service_instance.rb
 - lib/jfoundry/v2/service_broker.rb
-- lib/jfoundry/v2/client.rb
+- lib/jfoundry/v2/app_event.rb
+- lib/jfoundry/v2/space.rb
+- lib/jfoundry/v2/service_plan.rb
+- lib/jfoundry/v2/stack.rb
 - lib/jfoundry/v2/organization.rb
+- lib/jfoundry/v2/route.rb
 - lib/jfoundry/v2/domain.rb
-- lib/jfoundry/v2/app_event.rb
-- lib/jfoundry/v2/base.rb
-- lib/jfoundry/v2/user.rb
-- lib/jfoundry/v2/quota_definition.rb
 - lib/jfoundry/v2/model_magic/to_many.rb
+- lib/jfoundry/v2/model_magic/attribute.rb
+- lib/jfoundry/v2/model_magic/to_one.rb
 - lib/jfoundry/v2/model_magic/has_summary.rb
 - lib/jfoundry/v2/model_magic/client_extensions.rb
 - lib/jfoundry/v2/model_magic/queryable_by.rb
-- lib/jfoundry/v2/model_magic/attribute.rb
-- lib/jfoundry/v2/model_magic/to_one.rb
+- lib/jfoundry/v2/model.rb
+- lib/jfoundry/v2/user.rb
+- lib/jfoundry/v2/client.rb
+- lib/jfoundry/v2/base.rb
+- lib/jfoundry/v2/app.rb
 - lib/jfoundry/v2/service_auth_token.rb
-- lib/jfoundry/v2/service_instance.rb
-- lib/jfoundry/v2/route.rb
-- lib/jfoundry/v2/space.rb
+- lib/jfoundry/v2/quota_definition.rb
+- lib/jfoundry/v2/service_binding.rb
+- lib/jfoundry/v2/service.rb
+- lib/jfoundry/v2/managed_service_instance.rb
+- lib/jfoundry/v2/model_magic.rb
 - lib/jfoundry/v2/user_provided_service_instance.rb
-- lib/jfoundry/rest_client.rb
-- lib/jfoundry/concerns/proxy_options.rb
+- lib/jfoundry/validator.rb
+- lib/jfoundry/chatty_hash.rb
+- lib/jfoundry/baseclient.rb
+- lib/jfoundry/client.rb
 - lib/jfoundry/test_support.rb
+- lib/jfoundry/auth_token.rb
+- lib/jfoundry/signature/version.rb
+- lib/jfoundry/version.rb
 - lib/jfoundry/trace_helpers.rb
-- lib/jfoundry/upload_helpers.rb
-- lib/jfoundry/validator.rb
-- lib/jfoundry/errors.rb
-- lib/jfoundry/timer.rb
-- lib/jfoundry/signer.rb
-- lib/jfoundry.rb
-- lib/cc_api_stub/login.rb
+- lib/test/app_test.rb
 - lib/cc_api_stub/spaces.rb
-- lib/cc_api_stub/users.rb
-- lib/cc_api_stub/domains.rb
+- lib/cc_api_stub/helper.rb
 - lib/cc_api_stub/runtimes.rb
+- lib/cc_api_stub/routes.rb
+- lib/cc_api_stub/service_instances.rb
+- lib/cc_api_stub/organizations.rb
+- lib/cc_api_stub/login.rb
+- lib/cc_api_stub/users.rb
 - lib/cc_api_stub/applications.rb
-- lib/cc_api_stub/frameworks.rb
 - lib/cc_api_stub/services.rb
-- lib/cc_api_stub/organizations.rb
-- lib/cc_api_stub/helper.rb
-- lib/cc_api_stub/organization_users.rb
-- lib/cc_api_stub/service_instances.rb
+- lib/cc_api_stub/frameworks.rb
 - lib/cc_api_stub/service_bindings.rb
-- lib/cc_api_stub/routes.rb
-- lib/cc_api_stub.rb
-- lib/tasks/gem_release.rake
-- vendor/errors/README.md
+- lib/cc_api_stub/domains.rb
+- lib/cc_api_stub/organization_users.rb
 - vendor/errors/v2.yml
+- vendor/errors/README.md
 - vendor/errors/v1.yml
 homepage: https://code.jd.com/jae_m/jfoundry
-licenses: 
+licenses:
 - Apache 2.0
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: jfoundry
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: High-level library for working with the Jing Dong Foundry API.
 test_files: []
-