dply 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f3e34398e2ce8ed69937c8b11d4a1ed6a5f5cdc
-  data.tar.gz: 71bd323629adea2e93cc46106778ae3cf51af7fa
+  metadata.gz: 65bf4e5272b3c64dfeb0094ab9129ed83bb75979
+  data.tar.gz: 3864b9d7e108ca4e0ab479e6f5f7f4ae65a98799
 SHA512:
-  metadata.gz: 3b458ce22180281866152d695fe4a19dbabcc187040c13e8c345a9cb5738a19c11c64bbfbb41387105a0aab75cedaafcab09bcbd41c991ac4aae07432e17d528
-  data.tar.gz: ee76de74b5e7986ddea9f4782e8ad05945a42b1646e9463b59fb3a5db08e8301f0c85c65cf4bf3fd8c9c90775cb7e814b175c1405fc2e56ef76136f85a1c8097
+  metadata.gz: b7a82d15260f094fbcf7794ad59cd7144943f5d6e0fff6111cc353e2ab9ca27d1c045c595a3b2f93ce41756cce2c849b6fee1f0d6c28ca140fcbdbe667aeb706
+  data.tar.gz: f4d927b29fa7b31e35e94095690e339938f9865e6254eee256b352db8985df3ac5ce7434324b4445e500cece8644d623b3b682a1132d59d150538d6ca3334aaf

data/bin/drake

@@ -71,7 +71,7 @@ begin
 
   command = (ARGV.shift || "").to_sym
   case command
-  when :deploy, :reload, :task, :build, :depcheck, :"install-pkgs", :reopen_logs
+  when :deploy, :reload, :task, :build, :depcheck, :"install-pkgs", :reopen_logs, :status
     run_cli command, ARGV
   when /\A[a-zA-Z_\-0-9]+[:][a-zA-Z_\-0-9]+\z/
     require 'dply/tasks'

data/lib/dply/archive.rb

@@ -72,8 +72,9 @@ module Dply
     def download(url, outfile)
       logger.bullet "downloading #{url} to #{outfile}"
       http_status = `curl -w "%{http_code}" -f -s -o '#{outfile}' '#{url}' `
-      if http_status != "200"
-        error "failed to download #{outfile}, http status #{http_status}"
+      exit_status = $?.existstatus
+      if (http_status != "200" || exit_status != 0)
+        error "failed to download #{outfile}, http status #{http_status}, exit_status #{exit_status}"
       end
     end
   

data/lib/dply/cli/status.rb

@@ -0,0 +1,42 @@
+require 'dply/logger'
+require 'dply/release'
+require 'dply/config'
+
+module Dply
+  module Cli
+    class Status
+
+      include Logger
+
+      def initialize(argv)
+        @argv = argv
+      end
+
+      def run
+        print_status
+      end
+
+      def print_status
+        r = current_release
+        color = r[:deployed] ? :green : :red
+        logger.info "#{r[:revision].send color} #{r[:project]} #{r[:branch]} #{r[:timestamp]}" 
+      end
+
+      def current_release
+        @current_release ||= begin
+          if File.symlink? current_dir
+            name = File.basename( File.readlink current_dir )
+          else
+            name = "NA"
+          end
+          Release.parse name
+        end
+      end
+
+      def current_dir
+        @current_dir ||= "current"
+      end
+
+    end
+  end
+end

data/lib/dply/config_downloader.rb

@@ -1,4 +1,5 @@
 require 'dply/helper'
+require 'fileutils'
 module Dply
   class ConfigDownloader
 
@@ -12,12 +13,14 @@ module Dply
     end
 
     def download_all
+      init_tmpdir
       @config_files.each do |f|
         if @skip_download.include? f
           logger.debug "skipping to download file #{f}"
           next
         end
         download f
+        FileUtils.mv "#{tmpdir}/#{f}", "config/#{f}"
       end
     end
 
@@ -26,11 +29,23 @@ module Dply
     def download(file)
       url = "#{@base_url}/#{file}"
       logger.bullet "downloading #{file}"
-      http_status = `curl -w "%{http_code}" -f -s -o 'config/#{file}' '#{url}' `
-      if http_status != "200"
-        error "failed to download #{file}, http status #{http_status}"
+      http_status = `curl -w "%{http_code}" -f -s -o '#{tmpdir}/#{file}' '#{url}' `
+      exitstatus = $?.exitstatus
+      if (http_status != "200"  || exitstatus != 0 )
+        error "failed to download #{file}, http status #{http_status}, exitstatus #{exitstatus}"
       end
     end
 
+    def tmpdir
+      @tmpdir ||= "tmp/config_dl"
+    end
+
+    def init_tmpdir
+      if File.exists? tmpdir
+        FileUtils.rm_rf tmpdir
+      end
+      FileUtils.mkdir_p tmpdir
+    end
+
   end
 end

data/lib/dply/release.rb

@@ -25,6 +25,18 @@ module Dply
       latest ? File.basename(latest) : nil
     end
 
+    def self.parse(name)
+      arr = name.split("-")
+      deployed = File.exist? "releases/#{name}/.deployed"
+      release = {
+        revision: arr[0] || "NA",
+        project: arr[1] || "NA",
+        branch: arr[2] || "NA",
+        timestamp: arr[3] || "NA",
+        deployed: deployed
+      }
+    end
+
     def initialize(revision, app_name: nil, branch: nil, url: nil)
       @revision = revision
       @branch = branch

data/lib/dply/strategy/archive.rb

@@ -75,7 +75,7 @@ module Dply
       def download_configs
         files = config_map.values.uniq
         downloader = ConfigDownloader.new(files, config_download_url)
-        downloader.skip_download = config_skip_download 
+        downloader.skip_download = config_skip_download if config_skip_download 
         downloader.download_all
       end
 

data/lib/dply/strategy/git.rb

@@ -62,7 +62,7 @@ module Dply
       def download_configs
         files = config_map.values.uniq
         downloader = ConfigDownloader.new(files, config_download_url)
-        downloader.skip_download = config_skip_download 
+        downloader.skip_download = config_skip_download if config_skip_download 
         downloader.download_all
       end
 

data/lib/dply/version.rb

@@ -1,3 +1,3 @@
 module Dply
-  VERSION = "0.1.8"
+  VERSION = "0.1.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dply
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Neeraj
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-09 00:00:00.000000000 Z
+date: 2015-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-elf
@@ -101,6 +101,7 @@ files:
 - lib/dply/cli/install_pkgs.rb
 - lib/dply/cli/reload.rb
 - lib/dply/cli/reopen_logs.rb
+- lib/dply/cli/status.rb
 - lib/dply/cli/task.rb
 - lib/dply/config.rb
 - lib/dply/config_downloader.rb