larrow-runner 0.0.1 → 0.0.2

data/lib/larrow/runner/model/app.rb

@@ -1,11 +1,11 @@
 module Larrow::Runner
   module Model
     class App
-
+      include Service
       attr_accessor :vcs, :node, :configuration
       def initialize vcs, attributes={}
         self.vcs = vcs
-        self.configuration = vcs.configuration
+        self.configuration = Manifest.configuration vcs
         self.assign attributes unless attributes.empty?
       end
 
@@ -29,7 +29,7 @@ module Larrow::Runner
         RunLogger.title 'allocate resource'
         begin_at = Time.new
         option = {image_id: configuration.image}
-        self.node = Node.new(*Cloud.create(option).first)
+        self.node = Node.new(*Session.cloud.create(option).first)
         during = sprintf('%.2f', Time.new - begin_at)
         RunLogger.level(1).detail "allocated(#{during}s)"
       end
@@ -37,7 +37,7 @@ module Larrow::Runner
       def build_image
         action :image
         node.stop
-        new_image = Cloud.create_image node.instance.id
+        new_image = Session.cloud.create_image node.instance.id
         RunLogger.level(1).detail "New Image Id: #{new_image.id}"
         [
           "To reduce the system setup, you might want to change larrow.yml.",

data/lib/larrow/runner/model/node.rb

@@ -1,73 +1,73 @@
+require 'larrow/qingcloud'
 module Larrow::Runner
   module Model
-  class Node
-    include Larrow::Runner::Service
-    include Larrow::Qingcloud
-    attr_accessor :instance, :eip
-    attr_accessor :user,:host
-    def initialize instance, eip, user='root'
-      self.instance = instance
-      self.eip = eip
-      self.host = eip.address
-      self.user = user
-      @executor = Executor.new host, user, nil, nil
-    end
+    class Node
+      include Larrow::Runner::Service
+      include Larrow::Qingcloud
+      attr_accessor :instance, :eip
+      attr_accessor :user,:host
+      def initialize instance, eip, user='root'
+        self.instance = instance
+        self.eip = eip
+        self.host = eip.address
+        self.user = user
+        @executor = Executor.new host, user, nil, nil
+      end
 
-    def execute command, base_dir:nil
-      block = if block_given?
-                -> (data) { yield data }
-              else
-                -> (data) {
-                  data.split(/\r?\n/).each do |msg|
-                    RunLogger.level(1).info msg 
-                  end
-                }
-              end
-      @executor.execute command, base_dir: base_dir, &block
-    end
+      def execute command, base_dir:nil
+        block = if block_given?
+                  -> (data) { yield data }
+                else
+                  -> (data) {
+                    data.split(/\r?\n/).each do |msg|
+                      RunLogger.level(1).info msg 
+                    end
+                  }
+                end
+        @executor.execute command, base_dir: base_dir, &block
+      end
 
-    def stop
-      self.instance = instance.stop
-    end
+      def stop
+        self.instance = instance.stop
+      end
 
-    def destroy
-      instance.destroy.force
-      eip.destroy.force
-      self
-    end
+      def destroy
+        Session.cloud.destroy instance,eip
+        self
+      end
 
-    def dump
-      {
-        instance:{id: instance.id},
-        eip:{id:eip.id, address:eip.address}
-      }
-    end
+      def dump
+        {
+          instance:{id: instance.id},
+          eip:{id:eip.id, address:eip.address}
+        }
+      end
 
-    def self.show resources, level=0
-      resources.map do |hash|
-        node = load_obj hash
-        RunLogger.level(level).info "instance: #{node.instance.id}"
-        RunLogger.level(level).info "eip:"
-        RunLogger.level(level+1).info "id: #{node.eip.id}"
-        RunLogger.level(level+1).info "address: #{node.eip.address}"
+      def self.show resources, level=0
+        resources.map do |hash|
+          node = load_obj hash
+          RunLogger.level(level).detail "instance: #{node.instance.id}"
+          RunLogger.level(level).detail "eip:"
+          RunLogger.level(level+1).detail "id: #{node.eip.id}"
+          RunLogger.level(level+1).detail "address: #{node.eip.address}"
+        end
       end
-    end
 
-    def self.cleanup resources
-      resources.map do |hash|
-        node = load_obj hash
-        future{node.destroy}
-      end.map do |instance|
-        RunLogger.detail "node cleaned: #{instance.address}"
+      def self.cleanup resources
+        resources.map do |hash|
+          node = load_obj hash
+          future{node.destroy}
+        end.map do |node|
+          RunLogger.info "node cleaned: #{node.eip.address}"
+        end
       end
-    end
 
-    def self.load_obj data
+      def self.load_obj data
         instance = Instance.new data[:instance][:id]
         eip = Eip.new data[:eip][:id],address:data[:eip][:address]
         new instance,eip
-    end
+      end
 
-  end
+    end
   end
 end

data/lib/larrow/runner/service/cloud.rb

@@ -19,10 +19,10 @@ module Larrow
         def create image_id:nil,count:1
           RunLogger.level(1).detail "assign node"
           instances = Instance.create(image_id: image_id||'trustysrvx64c',
-                                                 count:count,
-                                                 login_mode:'keypair',
-                                                 keypair_id: @keypair_id
-                                                )
+                                      count:count,
+                                      login_mode:'keypair',
+                                      keypair_id: @keypair_id
+                                     )
 
           eips = Eip.create(count:count)
           
@@ -42,8 +42,14 @@ module Larrow
           Image.list(:self, ids: [image_id]).size == 1
         end
 
+        # concurrent destroy(force)
+        def destroy *args
+          args.map(&:destroy).map(&:force)
+        end
+
         def check_available
           KeyPair.list
+          self
         rescue
           Qingcloud.remove_connection
           raise $!

data/lib/larrow/runner/session.rb

@@ -16,9 +16,9 @@ module Larrow
                   :keypair_id].
                   reduce({}){|s,key| s.update key => value_for(key)}
 
-          cloud = Service::Cloud.new data
+          tmp_cloud = Service::Cloud.new data
           begin
-            cloud.check_available
+            tmp_cloud.check_available
             RunLogger.info "login success! write to ~/.larrow"
             break
           rescue Exception => e
@@ -30,15 +30,18 @@ module Larrow
         File.write FILE, YAML.dump(content)
       end
 
-      def load_cloud
-        args = begin
-                 YAML.
-                   load(File.read FILE).
-                   with_indifferent_access[:qingcloud]
-               rescue
-                 nil
-               end
-        Service::Cloud.new args if args
+      def cloud
+        @cloud ||= begin
+                     args = YAML.
+                       load(File.read FILE).
+                       with_indifferent_access[:qingcloud]
+                     Service::Cloud.new(args).check_available
+                   rescue
+                     fail(InvalidConfigFile,
+                          {file:FILE,
+                           wiki:"setup-cloud-account"}
+                         )
+                   end
       end
 
       def value_for name

data/lib/larrow/runner/vcs/base.rb

@@ -1,17 +1,19 @@
-module Larrow::Runner::Vcs
-  class Base
-    attr_accessor :larrow_file
-    include Larrow::Runner
-    def configuration merge=true
-      configuration = Manifest.configuration(self)
-      if merge
-        Manifest.add_base_scripts configuration,self
+module Larrow::Runner
+  module Vcs
+    class Base
+      attr_accessor :larrow_file
+
+      def get filename
+        raise 'not implement yet'
       end
-      configuration
-    end
 
-    def formatted_url
-      raise 'not implement yet'
+      def update_source node, target_dir
+        raise 'not implement yet'
+      end
+
+      def formatted_url
+        raise 'not implement yet'
+      end
     end
   end
 end

data/lib/larrow/runner/vcs/github.rb

@@ -1,48 +1,50 @@
 require 'faraday'
 
-module Larrow::Runner::Vcs
-  class Github < Base
-    URL_TEMPLATE='https://raw.githubusercontent.com/%s/%s/%s/%s'
-    attr_accessor :organize, :name, :branch
-    # url sample:
-    # git@github.com:fsword/larrow-qingcloud.git
-    # https://github.com/fsword/larrow-qingcloud.git
-    def initialize url
-      self.branch = 'master'
-      case url
-      when /git@github\.com:(.+)\/(.+)\.git/
-        self.organize = $1
-        self.name     = $2
-      when /http.:\/\/github.com\/(.+)\/(.+)\.git/
-        self.organize = $1
-        self.name     = $2
+module Larrow::Runner
+  module Vcs
+    class Github < Base
+      URL_TEMPLATE='https://raw.githubusercontent.com/%s/%s/%s/%s'
+      attr_accessor :organize, :name, :branch
+      # url sample:
+      # git@github.com:fsword/larrow-qingcloud.git
+      # https://github.com/fsword/larrow-qingcloud.git
+      def initialize url
+        self.branch = 'master'
+        case url
+        when /git@github\.com:(.+)\/(.+)\.git/
+          self.organize = $1
+          self.name     = $2
+        when /http.:\/\/github.com\/(.+)\/(.+)\.git/
+          self.organize = $1
+          self.name     = $2
+        end
       end
-    end
 
-    def formatted_url
-      'git@github.com:%s/%s.git' % [organize, name]
-    end
+      def formatted_url
+        'git@github.com:%s/%s.git' % [organize, name]
+      end
 
-    def get filename
-      url = URL_TEMPLATE % [organize, name, branch, filename]
-      resp = Faraday.get(url)
-      case resp.status
-      when 200
-        resp.body
-      when 404
-        nil
-      else
-        raise resp.body
+      def get filename
+        url = URL_TEMPLATE % [organize, name, branch, filename]
+        resp = Faraday.get(url)
+        case resp.status
+        when 200
+          resp.body
+        when 404
+          nil
+        else
+          raise resp.body
+        end
       end
-    end
 
-    def update_source node, target_dir
-      template = ["git clone ",
-                  "--depth 1",
-                  "http://github.com/%s/%s.git",
-                  "-b %s %s"].join(' ')
-      cmd = template % [organize, name, branch, target_dir]
-      node.execute cmd
+      def update_source node, target_dir
+        template = ["git clone ",
+                    "--depth 1",
+                    "http://github.com/%s/%s.git",
+                    "-b %s %s"].join(' ')
+        cmd = template % [organize, name, branch, target_dir]
+        node.execute cmd
+      end
     end
   end
 end

data/lib/larrow/runner/version.rb

@@ -1,5 +1,5 @@
 module Larrow
   module Runner
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: larrow-runner
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - fsword
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-16 00:00:00.000000000 Z
+date: 2014-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,20 +80,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: tilt
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -108,20 +94,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.19'
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -162,26 +134,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.2.4
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.4'
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 5.4.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.4'
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 5.4.1
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
@@ -269,6 +221,15 @@ files:
 - Rakefile
 - bin/larrow
 - larrow-runner.gemspec
+- lib/active_support/core_ext/hash.rb
+- lib/active_support/core_ext/hash/compact.rb
+- lib/active_support/core_ext/hash/deep_merge.rb
+- lib/active_support/core_ext/hash/except.rb
+- lib/active_support/core_ext/hash/indifferent_access.rb
+- lib/active_support/core_ext/hash/keys.rb
+- lib/active_support/core_ext/hash/reverse_merge.rb
+- lib/active_support/core_ext/hash/slice.rb
+- lib/active_support/hash_with_indifferent_access.rb
 - lib/larrow/runner.rb
 - lib/larrow/runner/cli.rb
 - lib/larrow/runner/cli/build.rb