dapp 0.14.23 → 0.14.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8d1da8a8160be7b50b53511057698ca7bae2637
-  data.tar.gz: 62438a0975a40ba15c49e6d066b9ab48f847eee8
+  metadata.gz: f9f115f393447629b3885271e12e4f94c46e3d84
+  data.tar.gz: b94cc48fc7d207507671a6277d9d068584ffed25
 SHA512:
-  metadata.gz: 721388743f11b178777d376b689f91f2620ca0ea748cd62a89b9b0f3ff171eb9371e04af0531be573d60f84ab3918221accb943265d398b0b209c53fac9daa76
-  data.tar.gz: 9f504db1d359a3aeecdb0b8bdbb630618b2729926b6895e4987f0acb99c15559da14708f32f8ff10b792e042f325493d68f8b29081d6eb7154700d7d90a2e65a
+  metadata.gz: 341313c84ab7ad2217e24de1ae5eae2a8070442e7707f6a2639efa1ac8d3cc9d14fc076430028451c3c1797356bf65ef1922ffdd940b4bdff02a30cd813aed5e
+  data.tar.gz: b393d1e4c7f645217d6ce432c4f8cf7ac6a46bb8986d393abece6f04be9bd1a084420db01ccaffe26e8c6d5445582d2302bf09e86ff7d191e19b1f71bf799b4c

data/bin/dapp

@@ -2,42 +2,63 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 
-require 'rubygems'
-require 'dapp'
+def with_dapp_running_lock(&blk)
+  begin
+    file = ::File.open("/tmp/dapp_running.lock", ::File::RDWR | ::File::CREAT, 0o644)
+
+    if ARGV[0] == 'update'
+      unless file.flock(::File::LOCK_EX | ::File::LOCK_NB)
+        puts "There are other active dapp processes, exiting without update"
+        exit(0)
+      end
+    else
+      file.flock(::File::LOCK_SH)
+    end
+
+    yield
+  ensure
+    file.close
+  end
+end
+
+with_dapp_running_lock do
+  require 'rubygems'
+  require 'dapp'
 
-begin
   begin
     begin
-      Dapp::CLI.new.run
-    rescue Dapp::Error::Base => e
-      unless (message = Dapp::Helper::NetStatus.before_error_message(e)).empty?
-        $stderr.puts(message)
-      end
+      begin
+        Dapp::CLI.new.run
+      rescue Dapp::Error::Base => e
+        unless (message = Dapp::Helper::NetStatus.before_error_message(e)).empty?
+          $stderr.puts(message)
+        end
 
+        raise
+      end
+    rescue ::SystemExit
       raise
-    end
-  rescue ::SystemExit
-    raise
-  rescue ::Exception => e
-    "/tmp/dapp-stacktrace-#{SecureRandom.uuid}.out".tap do |filename|
-      ::File.open(filename, 'w') do |dapp_stacktrace|
-        dapp_stacktrace.write "#{e.backtrace.join("\n")}\n"
+    rescue ::Exception => e
+      "/tmp/dapp-stacktrace-#{SecureRandom.uuid}.out".tap do |filename|
+        ::File.open(filename, 'w') do |dapp_stacktrace|
+          dapp_stacktrace.write "#{e.backtrace.join("\n")}\n"
+        end
+        $stderr.puts "\033[1m\033[90mStacktrace dumped to #{filename}\033[0m"
       end
-      $stderr.puts "\033[1m\033[90mStacktrace dumped to #{filename}\033[0m"
-    end
 
-    raise
+      raise
+    end
+  rescue Dapp::Error::Shellout => e
+    $stderr.puts(Dapp::Helper::NetStatus.message(e))
+    exit 1
+  rescue Dapp::Error::Base, NetStatus::Exception => e
+    $stderr.puts(Dapp::Dapp.paint_string(Dapp::Helper::NetStatus.message(e), :warning))
+    exit 1
+  rescue Interrupt => _e
+    $stderr.puts(Dapp::Dapp.paint_string('Interrupted', :warning))
+    exit 1
+  rescue Errno::EACCES => _e
+    $stderr.puts(Dapp::Dapp.paint_string('Permission denied!', :warning))
+    exit 1
   end
-rescue Dapp::Error::Shellout => e
-  $stderr.puts(Dapp::Helper::NetStatus.message(e))
-  exit 1
-rescue Dapp::Error::Base, NetStatus::Exception => e
-  $stderr.puts(Dapp::Dapp.paint_string(Dapp::Helper::NetStatus.message(e), :warning))
-  exit 1
-rescue Interrupt => _e
-  $stderr.puts(Dapp::Dapp.paint_string('Interrupted', :warning))
-  exit 1
-rescue Errno::EACCES => _e
-  $stderr.puts(Dapp::Dapp.paint_string('Permission denied!', :warning))
-  exit 1
 end

data/lib/dapp/cli/command/base.rb

@@ -71,8 +71,8 @@ module Dapp
           raise
         end
 
-        def cli_options(**kvargs)
-          config.merge(**kvargs)
+        def cli_options(**kwargs)
+          config.merge(**kwargs)
         end
       end
     end

data/lib/dapp/version.rb

@@ -1,4 +1,4 @@
 module Dapp
-  VERSION = '0.14.23'.freeze
+  VERSION = '0.14.24'.freeze
   BUILD_CACHE_VERSION = 16
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.14.23
+  version: 0.14.24
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-21 00:00:00.000000000 Z
+date: 2017-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout