hdeploy 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eec00ee2ca9aaa249c5cc4119718de01ffad5609
-  data.tar.gz: 14adbd225cb0154c7113561afcfeebe468fdd101
+  metadata.gz: e8dbe68129b28119d741132d4054ceaa2a644b97
+  data.tar.gz: f3254d8bf8dbcef3fffa80fe29123cd1e886567b
 SHA512:
-  metadata.gz: f64ebdb9712e3c1e02edd45c69d6d94dad0ff6c581ebd49fc4caea3e74ab887839161666eb17dd7f8ffd4060b0e232a57deea0dcc97ce68b1ae6809ee2f71cb3
-  data.tar.gz: 56cee39bec219096382fba67d79dbe4ef41bfa9837d8e3bf0bea61af684983a2d7cadb737f9a093809ce6fc1d584d833970178c042e067f901f24130a4986ddf
+  metadata.gz: 16992c965bd5091faf81d3428b8c88c9db56e1431190463cfd2eca0e9beed0879b055ca4c7945ed6713fb6d1d6276d7500c9b3b7926c313323a221db09050ebe
+  data.tar.gz: a9126bb825a15a6b47fb79d026687f96ed28a168f56a35dfaa8d680d41cd362486a2d7f7cbba0da33fef2b378e0445ee154816bdd01bec12ae37ec4e02d2be10

data/.gitignore

@@ -1,3 +1,4 @@
+.vagrant
 *.gem
 *.rbc
 /.config

data/bin/hdeploy_client

@@ -11,7 +11,7 @@ node = HDeploy::Client.new
 # Fixme: slightly better error msgs etc
 
 if ARGV.length == 0
-  raise "please specify a command such symlink post_distribute_run_once post_symlink_run_once"
+  raise "please specify a command such symlink post_distribute_run_once post_symlink_run_once keepalive"
 else
   if ARGV.first == 'symlink'
     # we need special syntax: symlink app env
@@ -33,6 +33,17 @@ else
     end
 
     client.run_hook(ARGV[0],params)
+  elsif ARGV.first == 'keepalive'
+
+    if ARGV.count == 2
+      if ARGV.last.to_i > 10 and ARGV.last.to_i < 300 # just reasonnable values
+        (HDeploy::Conf.instance)['client']['keepalive_delay'] = ARGV.last.to_i
+      else
+        raise "if you specify a keepalive, it must be a number of seconds between 10 and 300 - default is #{(HDeploy::Conf.instance)['client']['keepalive_delay']}"
+      end
+    end
+    client.send('keepalive')
+
   else
     client.send(ARGV.first)
   end

data/hdeploy.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.summary       = %q{no summary}
   s.homepage      = "https://github.com/hdeploy/hdeploy"
 
-  s.files         = `git ls-files`.split($/).select{|i| not i.start_with? 'omnibus/'}
+  s.files         = `git ls-files`.split($/).select{|i| not i.start_with? 'omnibus/' and not i.downcase.start_with? 'vagrant' }
   s.executables   = s.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   s.test_files    = s.files.grep(%r{^(test|spec|features)/})
   s.require_paths = ["lib"]

data/lib/hdeploy/client.rb

@@ -3,13 +3,12 @@ require 'json'
 require 'fileutils'
 require 'pathname'
 require 'inifile'
-require 'pry'
 
 module HDeploy
   class Client
 
     def initialize
-      @conf = HDeploy::Conf.instance('./hdeploy.conf.json')
+      @conf = HDeploy::Conf.instance #FIXME search for the configuration at the right place
       @conf.add_defaults({
         'client' => {
           'keepalive_delay' => 60,
@@ -171,7 +170,7 @@ module HDeploy
               # FIXME: add altsource and BREAK
               # FIXME: don't run download as root!!
               #####
-              if f = find_executable('aria2')
+              if f = find_executable('aria2c')
                 system("#{f} -x 5 -d #{tgzpath} -o #{artifact}.tar.gz #{artdata['source']}")
 
               elsif f = find_executable('wget')

data/lib/hdeploy/conf.rb

@@ -11,12 +11,26 @@ module HDeploy
     attr_reader :file
 
     def initialize(file)
+      
+      # this is for omnibus and such
+      # not very elegant but it works...
+      if file.nil?
+        f = __FILE__
+        if f.start_with? '/opt/hdeploy/'
+          file = '/opt/hdeploy/hdeploy.json'
+        elsif f.start_with? '/opt/hdeploy-server/'
+          file = '/opt/hdeploy-server/hdeploy-server.json'
+        else
+          file = './hdeploy.json'
+        end
+      end
+
       @file = file
       reload
     end
 
     # FIXME: find a good way to set default path
-    def self.instance(path = '/opt/hdeploy/etc/hdeploy.conf.json')
+    def self.instance(path = nil)
       @@instance ||= new(path)
     end
 

data/lib/hdeploy/version.rb

@@ -1,4 +1,4 @@
 module HDeploy
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hdeploy
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Patrick Viet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-15 00:00:00.000000000 Z
+date: 2016-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json