algo 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb278f86fccf497cb5ece005a59c45ac56929fef
-  data.tar.gz: 8cf7c48ff992326edf08c6500cb48de73e8be902
+  metadata.gz: 86e649323aa163f71b928277a792a0feb51a10d1
+  data.tar.gz: 80a24c0659991faf6098bd2b4044535e5fcf636f
 SHA512:
-  metadata.gz: 4b3a4d6561a8adda98ad72b85e5b6e22896e5b8fad5f719adc81b9702b5b7bbcd416b50d9c04e02516cc1bb5aad81b4493d0533d82927875a9babb2f797c646c
-  data.tar.gz: d54c9d0a2d304a8fbf8fa635f988241ba2f4b925b0c787034d93cbbc2413368287470041a2b6fcaf4a44aecd78b8006fe12aa3f1610947599860a166abbd379e
+  metadata.gz: 191b611c8254f37d1883e14053babe39251ed473165adc5b1c77ddb344a71a397b97fcd9def50110de6accf2d67974745fe3330e2f211929ad93850296d49d3c
+  data.tar.gz: f78566709a4b7e3fb9cf1fd4ebc81e51efd2f9ed35c6ead54108c4ec7171618174497a900f43407ca0a82ad755471c36d45b06775f623a712d4a31f57aae41a2

data/examples/awesome-cluster.rb

@@ -10,7 +10,13 @@ cluster 'awesomecluster' do
   label 'com.example.sample', 'clusterwidelabel'
 
   # Define network
-  network 'net1'
+  network 'net1' do
+    ipam do
+      subnet '172.20.0.0/16'
+      ip_range '172.20.10.0/24'
+      gateway '172.20.10.11'
+    end
+  end
 
   # Define service
   service 'name' do
@@ -23,6 +29,21 @@ cluster 'awesomecluster' do
 
     env 'APP_DOMAIN', 'example.com'
 
+    # Mount host's directory/file
+    volume do
+      type 'bind'
+      source '/tmp/mount'
+      target '/mnt/sample'
+    end
+
+    # Mount host docker volume
+    volume do
+      type 'volume'
+      source 'volume-name'
+      target '/mnt/volume-sample'
+    end
+
+    # join network
     network 'net1'
   end
 

data/lib/algo.rb

@@ -5,9 +5,12 @@ require 'active_support'
 require 'active_support/core_ext'
 
 module Algo
+  require 'algo/error'
   require "algo/version"
   require "algo/docker"
   require "algo/dsl"
+  require "algo/runner"
   require "algo/cli"
   # Your code goes here...
+
 end

data/lib/algo/cli.rb

@@ -1,70 +1,5 @@
 module Algo
   class Cli < Thor
-    class ValidationError < StandardError; end
-
-    class ServiceValidator
-      def initialize srv_spec
-        @srv_spec = srv_spec
-      end
-
-      def validate
-        begin
-          @srv = Algo::Docker::Service.find(@srv_spec['Name'])
-        rescue Algo::Docker::Error::NotFoundError
-          @srv = nil
-        end
-        check_networks
-      end
-
-      def self.validate srv_spec
-        new(srv_spec).validate
-      end
-
-      private
-
-      def check_networks
-        return true if @srv.blank? or @srv.spec.networks.blank?
-        srv_networks = @srv.spec.networks.map { |n| { 'Target' => n.info['Name'] } }
-        unless srv_networks != @srv_spec['Networks']
-          @srv_spec['Networks'] = @srv.spec.networks.map { |n| { 'Target' => n.info['Id'] } }
-          return true
-        end
-        raise ValidationError, 'changing network in service is not supported'
-      end
-    end
-
-    class ServiceUpdator
-
-      def initialize srv_spec, options
-        @srv_spec = srv_spec
-        @options = options
-      end
-
-      def update
-        begin
-          srv = Algo::Docker::Service.find(@srv_spec['Name'])
-          if srv.raw_spec == @srv_spec
-            puts "service: #{@srv_spec['Name']}, status: ok"
-            return
-          end
-          srv.update @srv_spec unless dryrun?
-          puts "service: #{@srv_spec['Name']}, status: changed"
-        rescue Algo::Docker::Error::NotFoundError
-          Algo::Docker::Service.create(@srv_spec) unless dryrun?
-          puts "service: #{@srv_spec['Name']}, status: created"
-        end
-      end
-
-      def self.update srv_spec, dryrun=false
-        new(srv_spec, {dryrun: dryrun}).update
-      end
-
-      private
-
-      def dryrun?
-        @options[:dryrun]
-      end
-    end
 
     desc 'apply [INVENTRY_FILE]', 'Apply configuration to clusters'
     option :'dry-run', type: :boolean, default: false
@@ -76,73 +11,22 @@ module Algo
     def apply inventry
       Algo::Docker.url = options[:host] if options[:host]
       Algo::Docker.options = docker_opts if docker_opts.present?
-      puts 'Running with dry-run mode...' if options[:'dry-run']
       configuration = Algo::Dsl.load({}, inventry)
-      configuration.each do |cluster|
-        puts "Applying to cluster #{cluster['name']}..."
-
-        cluster['networks'].each do |net_spec|
-          begin
-            net = Algo::Docker::Network.find net_spec['Name']
-            puts "network: #{net_spec['Name']}, status: ok"
-          rescue Algo::Docker::Error::NotFoundError
-            Algo::Docker::Network.create net_spec unless options[:'dry-run']
-            puts "network: #{net_spec['Name']}, status: created"
-          end
-        end
-
-        cluster['services'].each do |srv_spec|
-          ServiceValidator.validate srv_spec
-        end
-        cluster['services'].each do |srv_spec|
-          ServiceUpdator.update srv_spec, options[:'dry-run']
-        end
-        Algo::Docker::Service.all
-          .select { |srv| srv.spec.name.start_with?("#{cluster['prefix']}-") }
-          .select { |srv| ! srv.spec.name.in? cluster['services'].map { |spec| spec['Name'] } }
-          .map { |srv|
-            srv_name = srv.spec.name
-            srv.remove unless options[:'dry-run']
-            puts "service: #{srv_name}, status: removed"
-          }
-        Algo::Docker::Network.all(skip_default=true)
-          .select { |net| net.info['Name'].start_with?("#{cluster['prefix']}-") }
-          .select { |net| ! net.info['Name'].in? cluster['networks'].map { |net_spec| net_spec['Name'] } }
-          .map { |net|
-            net_name = net.info['Name']
-            net.remove unless options[:'dry-run']
-            puts "network: #{net_name}, status: removed"
-          }
-        puts "Complete applying for cluster #{cluster['name']}!"
-      end
-    rescue ValidationError => e
-      puts 'configuration validation failed because ' + e.message
+      Algo::Runner::Apply.call configuration, options
     end
 
     desc 'rm [INVENTRY_FILE]', 'Terminate clusters'
     option :'dry-run', type: :boolean, default: false
+    option :'url', type: :string, desc: 'docker swarm url like tcp://localhost:2375'
+    option :'client_key', type: :string, desc: 'docker swarm client key path'
+    option :'client_sert', type: :string, desc: 'docker swarm client sert path'
+    option :'ssl_ca_file', type: :string, desc: 'docker swarm ssl ca file path'
+    option :'scheme', type: :string, desc: 'docker swarm connection scheme'
     def rm inventry
-      puts 'Running with dry-run mode...' if options[:'dry-run']
+      Algo::Docker.url = options[:host] if options[:host]
+      Algo::Docker.options = docker_opts if docker_opts.present?
       configuration = Algo::Dsl.load({}, inventry)
-      configuration.each do |cluster|
-        puts "Terminating cluster #{cluster['name']}..."
-        Algo::Docker::Service.all
-          .select { |srv| srv.spec.name.start_with?("#{cluster['prefix']}-") }
-          .map { |srv|
-            srv_name = srv.spec.name
-            srv.remove unless options[:'dry-run']
-            puts "service: #{srv_name}, status: removed"
-          }
-        Algo::Docker::Network.all(skip_default=true)
-          .select { |net| net.info['Name'].start_with?("#{cluster['prefix']}-") }
-          .select { |net| ! net.info['Name'].in? cluster['networks'].map { |net_spec| "#{cluster['prefix']}-#{net_spec['Name']}" } }
-          .map { |net|
-            net_name = net.info['Name']
-            net.remove unless options[:'dry-run']
-            puts "network: #{net_name}, status: removed"
-          }
-        puts "Complete Termination for cluster #{cluster['name']}..."
-      end
+      Algo::Runner::Rm.call configuration, options
     end
 
     private

data/lib/algo/docker/network.rb

@@ -3,6 +3,10 @@ module Algo
     class Network < Base
       DEFAULT_NETWORKS = %w(ingress none host bridge docker_gwbridge)
 
+      def name
+        info['Name']
+      end
+
       def inspect
           "<Algo::Docker::Network name=#{info['Name']} scope=#{info['Scope']}>"
       end

data/lib/algo/docker/service.rb

@@ -14,6 +14,10 @@ module Algo
         @spec = nil
       end
 
+      def name
+        info["Spec"]["Name"]
+      end
+
       def info
         @info = Docker::Service.find(@info["Id"]).info if @info["Spec"].blank?
         @info

data/lib/algo/dsl.rb

@@ -21,6 +21,13 @@ module Algo
       dsl.result
     end
 
+    def self.load_text(options, text)
+      dsl = new(options).tap do |dsl|
+        dsl.instance_eval(text)
+      end
+      dsl.result
+    end
+
     def initialize(options)
       @options = CLUSTER_DEFAULT.dup
       @options.merge!(options)

data/lib/algo/dsl/network.rb

@@ -2,6 +2,26 @@ module Algo
   class Dsl
     module Network
 
+      class IPAMContext
+        attr_reader :context
+
+        def initialize
+          @context = {}
+        end
+
+        def subnet item
+          @context['Subnet'] = item
+        end
+
+        def ip_range item
+          @context['IPRange'] = item
+        end
+
+        def gateway item
+          @context['Gateway'] = item
+        end
+      end
+
       class Context
 
         attr_reader :context
@@ -36,6 +56,13 @@ module Algo
           @context['EnableIPv6'] = true
         end
 
+        def ipam &block
+          ctx = Network::IPAMContext.new.tap do |ctx|
+            ctx.instance_eval(&block) if block_given?
+          end
+          @context['IPAM']['Config'] << ctx.context
+        end
+
         private
 
         def cluster_prefix

data/lib/algo/dsl/service.rb

@@ -2,6 +2,58 @@ module Algo
   class Dsl
     module Service
 
+      class VolumeContext
+        attr_reader :context
+
+        def initialize clstr_context, srv_context
+          @clstr_context = clstr_context
+          @srv_context = srv_context
+          @context = {}
+        end
+
+        def readonly
+          @context['ReadOnly'] = true
+        end
+
+        # @param [String] item volume name or host file/directory path
+        def source item
+          raise 'Need to call type at first' unless @context['Type']
+          if @context['Type'] == 'volume'
+            @context['Source'] = "#{cluster_prefix}#{item}"
+          else
+            @context['Source'] = item
+          end
+        end
+
+        # @param [String] item container mount path
+        def target item
+          @context['Target'] = item
+        end
+
+        # @param [String] volume type ex) bind,volume
+        def type item
+          @context['Type'] = item
+        end
+
+        def label key, val
+          @context['VolumeOptions'] ||= {}
+          @context['VolumeOptions']['Labels'] ||= {}
+          @context['VolumeOptions']['Labels'][key] = val
+        end
+
+        # @param [String] volume driver type ex) local
+        def driver item
+          @context['VolumeOptions'] ||= {}
+          @context['VolumeOptions'] = { 'DriverConfig' => { 'Name' => item } }
+        end
+
+        private
+
+        def cluster_prefix
+          "#{@clstr_context['prefix']}-" if @clstr_context['prefix']
+        end
+      end
+
       class Context
         attr_reader :context
 
@@ -43,20 +95,89 @@ module Algo
           @context['TaskTemplate']['ContainerSpec']['Env'] << "#{key}=#{val}"
         end
 
+        def workdir name
+          @context['TaskTemplate']['ContainerSpec']['Dir'] = name
+        end
+
+        def user name
+          @context['TaskTemplate']['ContainerSpec']['User'] = name
+        end
+
         # @param [String] period period string like 30s, 1m, 4h
         def stop_grace_period period
-          if period.end_with?('s')
-            period = period.chomp('s').to_i
-          elsif period.end_with?('m')
-            period = period.chomp('m').to_i * 60
-          elsif period.end_with?('h')
-            period = period.chomp('m').to_i * 60 * 60
-          else
-            raise
+          @context['TaskTemplate']['ContainerSpec']['StopGracePeriod'] = second_from_string(period) * 1e9
+        end
+
+        def volume &block
+          raise 'should be called in cluster' unless @context
+          ctx = Service::VolumeContext.new(@cluster, @context).tap do |ctx|
+            ctx.instance_eval(&block)
           end
-          @context['TaskTemplate']['ContainerSpec']['StopGracePeriod'] = period * 1000000000
+          @context['TaskTemplate']['ContainerSpec']['Mounts'] ||= []
+          @context['TaskTemplate']['ContainerSpec']['Mounts'] << ctx.context
         end
 
+        # Resources
+
+        def limit_cpu decimal
+          @context['TaskTemplate']['Resources'] ||= {}
+          @context['TaskTemplate']['Resources']['Limits'] ||= {}
+          @context['TaskTemplate']['Resources']['Limits']['NanoCPUs'] = decimal * 1e9
+        end
+
+        # @param [String] memory num with unit like 1B 20KB 30MB 1GB
+        def limit_memory memory
+          @context['TaskTemplate']['Resources'] ||= {}
+          @context['TaskTemplate']['Resources']['Limits'] ||= {}
+          @context['TaskTemplate']['Resources']['Limits']['MemoryBytes'] = memory_from_string memory
+        end
+
+        def reserve_cpu decimal
+          @context['TaskTemplate']['Resources'] ||= {}
+          @context['TaskTemplate']['Resources']['Reservation'] ||= {}
+          @context['TaskTemplate']['Resources']['Reservation']['NanoCPUs'] = decimal * 1e9
+        end
+
+        # @param [String] memory num with unit like 1B 20KB 30MB 1GB
+        def reserve_memory memory
+          @context['TaskTemplate']['Resources'] ||= {}
+          @context['TaskTemplate']['Resources']['Reservation'] ||= {}
+          @context['TaskTemplate']['Resources']['Reservation']['MemoryBytes'] = memory_from_string memory
+        end
+
+        # RestartPolicy
+
+        # @param [String] name none, on-failure or any
+        def restart_condition name
+          @context['TaskTemplate']['RestartPolicy'] ||= {}
+          @context['TaskTemplate']['RestartPolicy']['Condition'] = name
+        end
+
+        def restart_delay period
+          @context['TaskTemplate']['RestartPolicy'] ||= {}
+          @context['TaskTemplate']['RestartPolicy']['Delay'] = second_from_string(period) * 10e9
+        end
+
+        # @param [Integer] value
+        def restart_max_attempts value
+          @context['TaskTemplate']['RestartPolicy'] ||= {}
+          @context['TaskTemplate']['RestartPolicy']['Attempts'] = value
+        end
+
+        def restart_window value
+          @context['TaskTemplate']['RestartPolicy'] ||= {}
+          @context['TaskTemplate']['RestartPolicy']['Window'] = second_from_string(period) * 10e9
+        end
+
+        # Placement
+
+        def constraint condition
+          @context['TaskTemplate']['Placement'] ||= {}
+          @context['TaskTemplate']['Placement']['Constraints'] ||= []
+          @context['TaskTemplate']['Placement']['Constraints'] << condition
+        end
+
+
         # Label
 
         def label key, val
@@ -67,7 +188,31 @@ module Algo
         # Mode
 
         def replicas replica_size
-          @context['Mode']['Replicated']['Replicas']= replica_size
+          @context['Mode'] = { 'Replicated' => { 'Replicas' => replica_size } }
+        end
+
+        def global
+          @context['Mode'] = { 'Global' => {} }
+        end
+
+        # EndpointSpec
+
+        # @param [String] mode vip or dnsrr
+        def endpoint_mode mode
+          @context['EndpointSpec'] = { 'Mode' => mode }
+        end
+
+        # @param [String] port like 80 or 80:80 or 80/udp
+        def publish port
+          port, protocol = *port.split('/')  if '/'.in? port
+          target, publish = *port.split(':')  if ':'.in? port
+          @context['EndpointSpec'] ||= {}
+          @context['EndpointSpec']['Ports'] ||= []
+          @context['EndpointSpec']['Ports'] << {
+            'Protocol' => protocol,
+            'TargetPort' => target,
+            'PublishedPort' => publish
+          }.compact
         end
 
         # UpdateConfig
@@ -87,7 +232,7 @@ module Algo
         def network name
           @context['Networks'] ||= []
           @context['Networks'] << { 'Target' => "#{cluster_prefix}#{name}" }
-         end
+        end
 
         private
 
@@ -95,6 +240,34 @@ module Algo
           "#{@cluster['prefix']}-" if @cluster['prefix']
         end
 
+        def second_from_string(period)
+          if period.end_with?('s')
+            period.chomp('s').to_i
+          elsif period.end_with?('m')
+            period.chomp('m').to_i * 60
+          elsif period.end_with?('h')
+            period.chomp('m').to_i * 60 * 60
+          else
+            raise
+          end
+        end
+
+        def memory_from_string(memory)
+          if memory.end_with?('B')
+            memory.chomp('B').to_i
+          elsif memory.end_with?('KB')
+            memory.chomp('KB').to_i * 1e3
+          elsif memory.end_with?('MB')
+            memory.chomp('MB').to_i * 1e6
+          elsif memory.end_with?('GB')
+            memory.chomp('GB').to_i * 1e9
+          elsif memory.end_with?('TB')
+            memory.chomp('TB').to_i * 1e12
+          else
+            raise
+          end
+        end
+
       end
 
       def service name, &block

data/lib/algo/error.rb

@@ -0,0 +1,9 @@
+module Algo
+
+  module Error
+    class ValidationError < StandardError; end
+  end
+
+  include Error
+
+end

data/lib/algo/runner.rb

@@ -0,0 +1,6 @@
+module Algo
+  module Runner
+    require 'algo/runner/apply'
+    require 'algo/runner/rm'
+  end
+end

data/lib/algo/runner/apply.rb

@@ -0,0 +1,130 @@
+module Algo
+  module Runner
+    class Apply
+
+      class ServiceValidator
+        def initialize srv_spec
+          @srv_spec = srv_spec
+        end
+
+        def validate
+          begin
+            @srv = Algo::Docker::Service.find(@srv_spec['Name'])
+          rescue Algo::Docker::Error::NotFoundError
+            @srv = nil
+          end
+          check_networks
+        end
+
+        def self.validate srv_spec
+          new(srv_spec).validate
+        end
+
+        private
+
+        def check_networks
+          return true if @srv.blank? or @srv.spec.networks.blank?
+          srv_networks = @srv.spec.networks.map { |n| { 'Target' => n.name } }
+          unless srv_networks != @srv_spec['Networks']
+            @srv_spec['Networks'] = @srv.spec.networks.map { |n| { 'Target' => n.id } }
+            return true
+          end
+          raise ValidationError, 'changing network in service is not supported'
+        end
+      end
+
+      class ServiceUpdator
+
+        def initialize srv_spec, options
+          @srv_spec = srv_spec
+          @options = options
+        end
+
+        def update
+          begin
+            srv = Algo::Docker::Service.find(@srv_spec['Name'])
+            if srv.raw_spec == @srv_spec
+              puts "service: #{@srv_spec['Name']}, status: ok"
+              return
+            end
+            srv.update @srv_spec unless dryrun?
+            puts "service: #{@srv_spec['Name']}, status: changed"
+          rescue Algo::Docker::Error::NotFoundError
+            Algo::Docker::Service.create(@srv_spec) unless dryrun?
+            puts "service: #{@srv_spec['Name']}, status: created"
+          end
+        end
+
+        def self.update srv_spec, dryrun=false
+          new(srv_spec, {dryrun: dryrun}).update
+        end
+
+        private
+
+        def dryrun?
+          @options[:dryrun]
+        end
+      end
+
+      attr_reader :configuration, :options
+
+      def initialize configuration, options
+        @configuration = configuration
+        @options = options
+      end
+
+      def call
+        puts 'Running with dry-run mode...' if dryrun?
+        configuration.each do |cluster|
+          puts "Applying to cluster #{cluster['name']}..."
+
+          cluster['networks'].each do |net_spec|
+            begin
+              net = Algo::Docker::Network.find net_spec['Name']
+              puts "network: #{net_spec['Name']}, status: ok"
+            rescue Algo::Docker::Error::NotFoundError
+              Algo::Docker::Network.create net_spec unless dryrun?
+              puts "network: #{net_spec['Name']}, status: created"
+            end
+          end
+          cluster['services'].each do |srv_spec|
+            ServiceValidator.validate srv_spec
+          end
+          cluster['services'].each do |srv_spec|
+            ServiceUpdator.update srv_spec, dryrun?
+          end
+          Algo::Docker::Service.all
+            .select { |srv| srv.spec.name.start_with?("#{cluster['prefix']}-") }
+            .select { |srv| ! srv.spec.name.in? cluster['services'].map { |spec| spec['Name'] } }
+            .map { |srv|
+              srv_name = srv.spec.name
+              srv.remove unless dryrun?
+              puts "service: #{srv_name}, status: removed"
+            }
+          Algo::Docker::Network.all(skip_default=true)
+            .select { |net| net.name.start_with?("#{cluster['prefix']}-") }
+            .select { |net| ! net.name.in? cluster['networks'].map { |net_spec| net_spec['Name'] } }
+            .map { |net|
+              net_name = net.name
+              net.remove unless dryrun?
+              puts "network: #{net_name}, status: removed"
+            }
+          puts "Complete applying for cluster #{cluster['name']}!"
+        end
+      rescue Algo::ValidationError => e
+        puts 'configuration validation failed because ' + e.message
+      end
+
+      def self.call configuration, options
+        new(configuration, options).call
+      end
+
+      private
+
+      def dryrun?
+        options[:'dry-run']
+      end
+
+    end
+  end
+end

data/lib/algo/runner/rm.rb

@@ -0,0 +1,46 @@
+module Algo
+  module Runner
+    class Rm
+      attr_reader :configuration, :options
+
+      def initialize configuration, options
+        @configuration = configuration
+        @options = options
+      end
+
+      def call
+        puts 'Running with dry-run mode...' if dryrun?
+        configuration.each do |cluster|
+          puts "Terminating cluster #{cluster['name']}..."
+          Algo::Docker::Service.all
+            .select { |srv| srv.spec.name.start_with?("#{cluster['prefix']}-") }
+            .map { |srv|
+              srv_name = srv.spec.name
+              srv.remove unless dryrun?
+              puts "service: #{srv_name}, status: removed"
+            }
+          Algo::Docker::Network.all(skip_default=true)
+            .select { |net| net.info['Name'].start_with?("#{cluster['prefix']}-") }
+            .select { |net| ! net.info['Name'].in? cluster['networks'].map { |net_spec| "#{cluster['prefix']}-#{net_spec['Name']}" } }
+            .map { |net|
+              net_name = net.info['Name']
+              net.remove unless dryrun?
+              puts "network: #{net_name}, status: removed"
+            }
+          puts "Complete Termination for cluster #{cluster['name']}..."
+        end
+      end
+
+      def self.call configuration, options
+        new(configuration, options).call
+      end
+
+      private
+
+      def dryrun?
+        options[:'dry-run']
+      end
+
+    end
+  end
+end

data/lib/algo/version.rb

@@ -1,3 +1,3 @@
 module Algo
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: algo
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - yoshiso
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-25 00:00:00.000000000 Z
+date: 2016-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -140,6 +140,10 @@ files:
 - lib/algo/dsl/cluster.rb
 - lib/algo/dsl/network.rb
 - lib/algo/dsl/service.rb
+- lib/algo/error.rb
+- lib/algo/runner.rb
+- lib/algo/runner/apply.rb
+- lib/algo/runner/rm.rb
 - lib/algo/version.rb
 homepage: https://github.com/yoshiso/algo
 licenses: