dply 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9116641abdea1ae1e27604cff732fcde2cb8b419
-  data.tar.gz: 78536afe271e16e664af6aee88a7504367c149cc
+  metadata.gz: 78868f8ab27e27eeae74bbf55c79def56dc5005f
+  data.tar.gz: d84a93dba3ecfcd349233515cbb39593870c4ea6
 SHA512:
-  metadata.gz: 7f443a27744fbf10985c8a7692e0eb1cec4cf0956580f66a43a1d3ea56c8ab99f03a753ad632473b4c9550930fa5b395709acc4d591ba38d13c9370c7ff5da48
-  data.tar.gz: c595250c790d13933137a7ee88661edbdec5eeb41396900c29f8019f7f195a49d7a42059ea2a5566bc8ce133969e0f4c94bccf16b78050e14863a062dae675ac
+  metadata.gz: 0c6cb63cda32f77e803c2cd6ec737711c7899c95eecbb48edeee64ebd597a7abf6a3fbb8bb8b35195dd03219deef179013c0606646439b35e72f0946fde0ce6f
+  data.tar.gz: 8af1d7824138f70013f1bdcda916cc8a83e22cc01c6d815fb43981801bd99daca4b0a29cdc7b96f20e8382a611d8e8e4993a51b125963ebd1f1af51315f7c285

data/bin/drake

@@ -8,6 +8,8 @@ require 'dply/logger'
 require 'dply/config'
 require 'pathname'
 
+File.umask 0022
+
 logger = ::Dply::Logger.logger
 
 options = {}

data/lib/dply/archive.rb

@@ -26,7 +26,7 @@ module Dply
 
     def download_file
       if File.exists? path
-        download if not verify_checksum
+        download(uri, path) if not verify_checksum
       else
         download(uri, path)
       end

data/lib/dply/build.rb

@@ -1,6 +1,5 @@
 require 'dply/helper'
 require 'dply/setup'
-require 'dply/linker'
 require 'dply/config_downloader'
 require 'dply/yum'
 require 'dply/tasks'
@@ -28,8 +27,7 @@ module Dply
       Dir.chdir repo_dir do
         git_step
         git.clean
-        link_dirs
-        link_config
+        link_all
         install_pkgs
         clean_build_dir
         link_build_dir
@@ -61,20 +59,9 @@ module Dply
       end
     end
 
-    def link_dirs
-      link "#{config.dir}/shared", dir_map
-    end
-
-    def link_config
-      link "#{config.dir}/config", config_map
-    end
-
-    def link(source, map)
-      return if not map
-      logger.bullet "symlinking #{source}"
-      dest = repo_dir
-      linker = Linker.new(source, dest, map: map)
-      linker.create_symlinks
+    def link_all
+      tasks.link "#{config.dir}/shared", dir_map
+      tasks.link "#{config.dir}/config", config_map
     end
 
     def install_pkgs

data/lib/dply/release.rb

@@ -8,7 +8,22 @@ module Dply
     include Helper
 
     attr_accessor :url, :verify_checksum
-    attr_reader :name
+    attr_writer :name
+
+    def self.find_or_create(revision, **kwargs)
+      release = new(revision, **kwargs)
+      name = find_installed_name(revision, **kwargs)
+      release.name = name if name
+      return release
+    end
+
+    def self.find_installed_name(revision, **kwargs)
+      branch = kwargs.fetch(:branch).to_s.gsub(/-/, "_")
+      app_name = kwargs.fetch(:app_name).to_s.gsub(/-/, "_")
+      name_without_ts = "#{revision}-#{app_name}-#{branch}-"
+      latest = Dir["releases/#{name_without_ts}*"].sort_by { |x, y| File.mtime(x) }.first
+      latest ? File.basename(latest) : nil
+    end
 
     def initialize(revision, app_name: nil, branch: nil, url: nil)
       @revision = revision
@@ -18,25 +33,43 @@ module Dply
     end
 
     def make_current
-      raise "cannot make not installed release current" if not installed?
-      raise "release path #{path} doesn't exist"  if not File.directory? path
+      error "cannot make not installed release current" if not installed?
+      error "release path #{path} doesn't exist"  if not File.directory? path
       symlink path, "current"
     end
 
+    def name
+      @name ||= "#{@revision}-#{replace_dashes(@app_name)}-#{replace_dashes(@branch)}-#{timestamp}"
+    end
+
     def install
-      return if installed?
-      @name = name_without_ts + timestamp
+      if installed?
+        logger.debug "release #{name} already installed"
+        return
+      end
       Dir.mktmpdir "tmp" do |d|
         path = "#{d}/#{name}"
         archive.extract_to path
-        FileUtils.mv path, "releases"
+        FileUtils.mv path, "releases/"
       end
-      @installed = true
       archive.clean
     end
 
     def path
-      @path ||= "releases/#{@name}"
+      @path ||= "releases/#{name}"
+    end
+
+    def record_deployment
+      FileUtils.touch "#{path}/.deployed"
+    end
+
+    def already_deployed?
+      File.exist? "#{path}/.deployed"
+    end
+
+    def current?
+      return false if not File.symlink? "current"
+      File.basename(File.readlink "current") == name
     end
 
     private
@@ -53,23 +86,8 @@ module Dply
       Time.now.strftime "%Y%m%d%H%M%S"
     end
 
-    def load_status
-      name = name_without_ts
-      latest = Dir["releases/#{name}*"].sort_by { |x, y| File.mtime(x) }.first
-      if latest
-        @installed = true
-        @name = File.basename latest
-      end
-      @status_loaded = true
-    end
-
     def installed?
-      load_status if not @status_loaded
-      @installed
-    end
-
-    def name_without_ts
-      @name_without_ts ||= "#{@revision}-#{replace_dashes(@app_name)}-#{replace_dashes(@branch)}-"
+      File.exist? path
     end
 
   end

data/lib/dply/rpm.rb

@@ -7,12 +7,7 @@ module Dply
     def libs_to_packages(libs)
       packages = Set.new
       libs.each do |l|
-        lib = "#{l}()(64bit)"
-        command = %(rpm --queryformat "%{NAME} " -q --whatprovides "#{lib}")
-        logger.debug command
-        output = `#{command}`
-        error "running command #{command}" if not $?.exitstatus == 0
-        list = output.strip.split.select {|pkg| not filtered? pkg }
+        list = whatprovides(l)
         packages << list if not list.empty?
       end
       return packages
@@ -23,5 +18,14 @@ module Dply
       @filtered.include? pkg.strip
     end
 
+    def whatprovides(lib)
+      lib = "#{lib}()(64bit)"
+      command = %(rpm --queryformat "%{NAME} " -q --whatprovides "#{lib}")
+      logger.debug command
+      output = `#{command}`
+      error "running command #{command}" if not $?.exitstatus == 0
+      list = output.strip.split.select {|pkg| not filtered? pkg }
+    end
+
   end
 end

data/lib/dply/strategy/archive.rb

@@ -1,7 +1,6 @@
 require 'dply/helper'
 require 'dply/tasks'
 require 'dply/setup'
-require 'dply/linker'
 require 'dply/config_downloader'
 require 'dply/yum'
 require 'dply/release'
@@ -27,6 +26,12 @@ module Dply
 
       def deploy
         setup.archive
+        if release.already_deployed? && release.current?
+          logger.info "revision #{revision} is currently deployed"
+          current_version = previous_version = get_release
+          tasks.report_changes(current_version, previous_version)
+          return
+        end
         download_configs if config_download_url
         install_release
         previous_version = get_release
@@ -34,6 +39,7 @@ module Dply
         Dir.chdir current_dir do
           tasks.deploy target
         end
+        release.record_deployment
         current_version = get_release
         tasks.report_changes(previous_version, current_version)
       end
@@ -41,8 +47,7 @@ module Dply
       def reload
         download_configs if config_download_url
         Dir.chdir current_dir do
-          link_dirs
-          link_config
+          link_all
           tasks.reload target
         end
       end
@@ -74,7 +79,7 @@ module Dply
       end
 
       def release
-        @release ||= Release.new(
+        @release ||= Release.find_or_create(
           revision, branch: branch,
           app_name: config.name,
           url: config.build_url
@@ -85,8 +90,7 @@ module Dply
         release.verify_checksum = config.verify_checksum
         release.install
         Dir.chdir release.path do
-          link_dirs
-          link_config
+          link_all
           tasks.install_pkgs(use_yum: options[:use_yum])
         end
       end
@@ -100,12 +104,9 @@ module Dply
         end
       end
 
-      def link_dirs
-        link "#{config.dir}/shared", dir_map
-      end
-
-      def link_config
-        link "#{config.dir}/config", config_map
+      def link_all
+        tasks.link "#{config.dir}/shared", dir_map
+        tasks.link "#{config.dir}/config", config_map
       end
 
       def setup
@@ -116,14 +117,6 @@ module Dply
         @tasks ||= Tasks.new(deployment: true)
       end
 
-      def link(source, map)
-        return if not map
-        logger.bullet "symlinking #{source}"
-        dest = Dir.pwd
-        linker = Linker.new(source, dest, map: map)
-        linker.create_symlinks
-      end
-
     end
   end
 end

data/lib/dply/strategy/git.rb

@@ -1,6 +1,5 @@
 require 'dply/helper'
 require 'dply/setup'
-require 'dply/linker'
 require 'dply/config_downloader'
 require 'dply/yum'
 require 'dply/tasks'
@@ -31,8 +30,7 @@ module Dply
           previous_version = git.commit_id
           git_step
           current_version = git.commit_id
-          link_dirs
-          link_config
+          link_all
           install_pkgs
           tasks.deploy target
           tasks.report_changes(previous_version, current_version)
@@ -42,8 +40,7 @@ module Dply
       def reload
         download_configs if config_download_url
         Dir.chdir current_dir do
-          link_dirs
-          link_config
+          link_all
           tasks.reload target
         end
       end
@@ -78,12 +75,9 @@ module Dply
         end
       end
 
-      def link_dirs
-        link "#{config.dir}/shared", dir_map
-      end
-
-      def link_config
-        link "#{config.dir}/config", config_map
+      def link_all
+        tasks.link "#{config.dir}/shared", dir_map
+        tasks.link "#{config.dir}/config", config_map
       end
 
       def install_pkgs
@@ -98,14 +92,6 @@ module Dply
         @tasks ||= Tasks.new(deployment: true)
       end
 
-      def link(source, map)
-        return if not map
-        logger.bullet "symlinking #{source}"
-        dest = current_dir
-        linker = Linker.new(source, dest, map: map)
-        linker.create_symlinks
-      end
-
     end
   end
 end

data/lib/dply/tasks.rb

@@ -2,6 +2,7 @@ require 'json'
 require 'dply/shell'
 require 'dply/bundle'
 require 'dply/yum'
+require 'dply/linker'
 require 'dply/pkgs_config'
 
 module Dply
@@ -54,6 +55,14 @@ module Dply
       end
     end
 
+    def link(source, map)
+      return if not map
+      logger.bullet "symlinking #{source}"
+      dest = Dir.pwd
+      linker = Linker.new(source, dest, map: map)
+      linker.create_symlinks
+    end
+
     private
 
     def bundle

data/lib/dply/version.rb

@@ -1,3 +1,3 @@
 module Dply
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

data/lib/dplyr/remote_task.rb

@@ -80,9 +80,9 @@ module Dplyr
       host = host_info[:host]
       dir = host_info[:dir]
       if logger.debug?
-        %(ssh -tt -oBatchMode=yes -l #{user} #{host} "#{env} drake --remote --debug -d #{dir} #{task} 2>&1")
+        %(ssh -tt -oBatchMode=yes -l #{user} #{host} '#{env} drake --remote --debug -d #{dir} #{task} 2>&1')
       else
-        %(ssh -tt -oBatchMode=yes -l #{user} #{host} "#{env} drake --remote -d #{dir} #{task} 2>&1" 2>/dev/null)
+        %(ssh -tt -oBatchMode=yes -l #{user} #{host} '#{env} drake --remote -d #{dir} #{task} 2>&1' 2>/dev/null)
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dply
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Neeraj
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-05 00:00:00.000000000 Z
+date: 2015-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-elf