rat_deployer 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b70810b89cd248d2743394bee60594eb9f805b43
-  data.tar.gz: 01c8aaf1c41c572a3247e908cae364b04ab774a9
+  metadata.gz: 06b1d076beea38ee47efb7915fdd163effbe94cb
+  data.tar.gz: d51100bfd44437364f06797353b0913f90ed508d
 SHA512:
-  metadata.gz: 3e740ed48bc6b98d4943ea86ac77bc385a71594879819078062f5f9277db074b8b1fb286568b69033e5b23349567d87d4833343934fd1705f9f6fb52831d4b2c
-  data.tar.gz: 62fe85d2ba81954e2b6ce5ddac32c87d67db0cc54d453002228021e44a56e575858526d622c92596cca194c54a43f4d2fe0c118d03fca2aaa41c395b1522f4ef
+  metadata.gz: 148b9cc68a5e73b0d5a1d552243bc0be8e69a99a6216451534120b168a69c0f452f09f559e7fc3cd79a8262f205b0790c1f90646be2ba65dacc6d9c7b8b9abdd
+  data.tar.gz: 47b5d856552c5a895176d2fc170ec68d5f481f454465ade1ff25d453199376b03dddf53ccf14903a5bc55e4ffad7f87daefda30a391719aa7abac0f19b41cf42

data/lib/rat_deployer/cli/images.rb

@@ -1,4 +1,5 @@
 require 'thor'
+require 'yaml'
 
 require 'rat_deployer/config'
 require 'rat_deployer/command'
@@ -8,81 +9,104 @@ module RatDeployer
     class Images < Thor
       include RatDeployer::Command
 
-      desc 'update [SERVICES...]', 'Update images for given services'
-      def update(*services)
-        services.each do |svc|
-          put_heading "Updating image for service #{svc}"
-          do_build(svc)
-          do_push(svc)
+      desc 'update [SERVICES...]', 'Update images'
+      def update(*images)
+        get_images(images).each do |image|
+          put_heading "Updating image #{image}"
+
+          do_build(image)
+          do_push(image)
         end
       end
 
-      desc 'build [SERVICES...]', 'Build images for given services'
-      def build(*services)
-        services.each &method(:do_build)
+      desc 'build [SERVICES...]', 'Build images'
+      def build(*images)
+        get_images(images).each &method(:do_build)
       end
 
-      desc 'push [SERVICES...]', 'Push images for given services'
-      def push(*services)
-        services.each &method(:do_push)
+      desc 'push [SERVICES...]', 'Push images'
+      def push(*images)
+        get_images(images).each &method(:do_push)
       end
 
       private
 
-      def do_build(service)
-        put_heading "Building image for service #{service}"
-
-        ensure_image_source(service)
+      def get_images(images)
+        images.any? ? images : all_images
+      end
 
-        run "docker build #{source_path(service)} -t #{image_name(service)}"
+      def all_images
+        docker_conf = YAML.load(`RAT_PROMPT=false rat compose config`)
+        images = docker_conf.fetch("services").map { |_, c| c.fetch("image") }.uniq
       end
 
-      def do_push(service)
-        put_heading "Pusinhg image for service #{service}"
+      def do_build(image)
+        put_heading "Building image #{image}"
+        return unless image_conf_is_present?(image)
+        ensure_image_source(image)
+        run "docker build #{source_path(image)} -t #{image}"
+      end
 
-        run "docker push #{image_name(service)}"
+      def do_push(image)
+        put_heading "Pusinhg image #{image}"
+        return unless image_conf_is_present?(image)
+        run "docker push #{image}"
       end
 
-      def ensure_image_source(service)
-        if git_conf(service)
-          git_clone_repo(service) unless File.exists? source_path(service)
-          git_checkout(service)
-          git_pull(service)
+      def ensure_image_source(image)
+        if git_conf(image)
+          git_clone_repo(image) unless source_present?(image)
+          git_fetch(image)
+          git_checkout(image)
         else
-          unless File.exists? source_path(service)
-            put_error <<-ERROR
-              No source found for service #{service}."
-              Either specify git[url] or provision the source for #{service} yourself.
-            ERROR
+          unless source_present?(image)
+            put_error "Source for image #{image} is not present and no git config was provided for it. Either provide git url and optionally branch or provision the source yourself at #{source_path(image)}"
           end
         end
       end
 
-      def git_clone_repo(service)
-        url = git_conf(service).fetch("url")
-        run "git clone #{url} sources/#{service}"
+      def git_clone_repo(image)
+        url = image_conf(image).fetch('git').fetch('url')
+        run "git clone #{url} #{source_path(image)}"
+      end
+
+      def git_checkout(image)
+        run "git -C #{source_path(image)} checkout -f #{git_branch(image)}"
+        run "git -C #{source_path(image)} reset --hard origin/#{git_branch(image)}"
       end
 
-      def git_checkout(service)
-        branch = git_conf(service).fetch("branch", "master")
-        run "git -C #{source_path(service)} checkout -f #{branch}"
+      def git_fetch(image)
+        run "git -C #{source_path(image)} fetch origin #{git_branch(image)}"
       end
 
-      def git_pull(service)
-        branch = git_conf(service).fetch("branch", "master")
-        run "git -C #{source_path(service)} pull origin #{branch}"
+      def git_branch(image)
+        git_conf(image).fetch('branch', 'master')
       end
 
-      def source_path(service)
-        File.expand_path("./sources/#{service}")
+      def git_conf(image)
+        image_conf(image)['git']
       end
 
-      def git_conf(service)
-        RatDeployer::Config.for_service(service)["git"]
+      def image_conf(image)
+        RatDeployer::Config.images[image]
       end
 
-      def image_name(service)
-        RatDeployer::Config.for_service(service).fetch("name")
+      def source_path(image)
+        folder = image_conf(image).fetch('source', image)
+        File.expand_path("./sources/#{folder}")
+      end
+
+      def source_present?(image)
+        File.exists? source_path(image)
+      end
+
+      def image_conf_is_present?(image)
+        if image_conf(image)
+          true
+        else
+          put_warning "No image config found for image #{image}. Skipping"
+          false
+        end
       end
     end
   end

data/lib/rat_deployer/cli.rb

@@ -12,18 +12,13 @@ module RatDeployer
 
     desc "deploy", "deploys current environment"
     def deploy
-      images = RatDeployer::Config.for_env["images"]
+      unset_machine
+      run "rat images update"
 
-      if images.any?
-        unset_machine
-        run "rat images update #{images.keys.join(' ')}"
-        set_machine
+      within_machine do
         run "rat compose pull"
+        run "rat compose up -d"
       end
-
-      set_machine
-      run "rat compose up -d"
-      unset_machine
     end
 
     desc "compose ARGS...", "runs docker-compose command with default flags"
@@ -42,23 +37,26 @@ module RatDeployer
       run "docker-compose #{flags} #{cmd} #{cmd_flags.join(" ")}"
     end
 
-    desc "set_machine", "sets machine as configured in your rat_file"
+    private
+
     def set_machine
       machine = RatDeployer::Config.for_env.fetch("machine")
       run "eval $(docker-machine env #{machine})"
     end
 
-    desc "unset_machine", "unsets machine"
     def unset_machine
       run "eval $(docker-machine env --unset)"
     end
 
-    private
+    def within_machine(&block)
+      run "rat set_machine"
+      yield
+    ensure
+      run "rat unset_machine"
+    end
     
     def warn_if_running_on_remote_host
-      machine = ENV["DOCKER_MACHINE"]
-
-      if machine
+      if machine = ENV["DOCKER_MACHINE"]
         put_warning "Your docker client is pointing to the remote machine #{machine}"
         ask_for_confirmation
       end

data/lib/rat_deployer/command.rb

@@ -4,24 +4,31 @@ require 'highline/import'
 module RatDeployer
   module Command
     def run(cmd)
-      msg = "||=> Running command ".colorize(:blue) + "`#{cmd.colorize(:white)}`"
-      puts msg
+      if prompt_enabled?
+        msg = "||=> Running command ".colorize(:blue) + "`#{cmd.colorize(:white)}`"
+        puts msg
+      end
+
       system cmd
     end
 
     def put_heading(str)
+      return unless prompt_enabled?
       puts "|| #{str}".colorize(:blue)
     end
 
     def put_error(str)
+      return unless prompt_enabled?
       puts "// #{str}".colorize(:red)
     end
 
     def put_warning(str)
+      return unless prompt_enabled?
       puts colorize_warning(str)
     end
 
     def ask_for_confirmation
+      return unless prompt_enabled?
       prompt = "Are you sure you want to continue?"
 
       a = ''
@@ -39,5 +46,11 @@ module RatDeployer
     def colorize_warning(str)
       "\\\\ #{str}".colorize(:yellow)
     end
+
+    private
+    
+    def prompt_enabled?
+      ENV['RAT_PROMPT'] != "false"
+    end
   end
 end

data/lib/rat_deployer/config.rb

@@ -11,16 +11,18 @@ module RatDeployer
       ENV.fetch('RAT_ENV')
     end
 
-    def self.for_env(e = env)
-      confs        = all.fetch('environments')
-      default_conf = confs['default'] || confs['base'] || {}
-      env_conf     = confs.fetch(e)
+    def self.images
+      all.fetch('images', {})
+    end
 
-      default_conf.deep_merge env_conf
+    def self.environmental
+      all.fetch('environments', {})
     end
 
-    def self.for_service(service)
-      for_env.fetch('images').fetch(service)
+    def self.for_env(e = env)
+      default_conf = environmental.fetch('default', {})
+      env_conf     = environmental.fetch(e)
+      default_conf.deep_merge(env_conf)
     end
   end
 end

data/lib/rat_deployer/version.rb

@@ -1,3 +1,3 @@
 module RatDeployer
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rat_deployer
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Nicolas Oga
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-02 00:00:00.000000000 Z
+date: 2016-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor