dapp 0.13.9 → 0.13.10

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 3b002b0baef639d31484f8a6dc71dfacaa786683
4
- data.tar.gz: a19fc91d6667e26f4a64b4b232583553c5c16e9f
3
+ metadata.gz: 112878d27783e793fbef826a594b653b887c08d0
4
+ data.tar.gz: 654462c4125c802f88d2b48180e104068d78cab2
5
5
  SHA512:
6
- metadata.gz: 2b776834a1dbef3450b0d61d7bbefdb0afac5ee4cf80df121520e3fb540b9fcc0d3dc5567ac66ba2161df5880083ac687468c157200da64e6807f208bd401bdf
7
- data.tar.gz: bed8a4f7b6fd98cb8b0dcbd7f3dfb357d61a05cb32a0c9b6173e6e5f013839ce0e3a3172d7653945c5339edb2168b2078c3594140c191a50a5887d0532196190
6
+ metadata.gz: 6340aa6e33271b2649d90c6fd8676392534513cecc3ede7475e12053cb1de6fe8b3b07f70ea8ae2114fd43a6f9f56497af451ad8c94740e55692a2a1a740fdfd
7
+ data.tar.gz: 10d7e10a9348ffaf7420b5bacfbf266e9b294c6e0f378ab3e7d71a0a29bf793770987fdcb1815d7827e5d107ce8447dd310839917444a98c89247a84ebc58b18
@@ -39,7 +39,7 @@ en:
39
39
  secret_values_file_not_found: "Secret values file `%{path}` not found!"
40
40
  user_containers_detected: "User containers have been using images!\n%{ids}"
41
41
  incorrect_yaml_structure: "Incorrect YAML structure in `%{path}`!"
42
- editor_not_found: "Editor Not found!"
42
+ editor_not_found: "Editor not found!"
43
43
  dapp:
44
44
  no_such_dimg: "No such dimg: `%{dimgs_patterns}`!"
45
45
  no_such_app: "No such app: `%{apps_patterns}`!"
@@ -5,13 +5,14 @@ module Dapp
5
5
  /^#{repo_name_format}$/ =~ repo
6
6
  expected_hostname = Regexp.last_match(:hostname)
7
7
  expected_repo_suffix = Regexp.last_match(:repo_suffix)
8
- expected_hostname_url = expected_hostname ? "http://#{expected_hostname}" : nil
9
8
 
10
- if hostname_exist?(expected_hostname_url)
11
- Base.new(repo, expected_hostname_url, expected_repo_suffix)
12
- else
13
- Default.new(repo, File.join(*[expected_hostname, expected_repo_suffix].compact))
9
+ if expected_hostname
10
+ %w(https http).each do |protocol|
11
+ expected_hostname_url = [protocol, expected_hostname].join('://')
12
+ return Base.new(repo, expected_hostname_url, expected_repo_suffix) if hostname_exist?(expected_hostname_url)
13
+ end
14
14
  end
15
+ Default.new(repo, File.join(*[expected_hostname, expected_repo_suffix].compact))
15
16
  end
16
17
 
17
18
  def self.repo_name_format
@@ -60,10 +60,7 @@ module Dapp
60
60
  end
61
61
 
62
62
  def find_commit_id_by_message(regex)
63
- walker.each do |commit|
64
- next unless commit.message =~ regex
65
- return commit.oid
66
- end
63
+ walker.each { |commit| return commit.oid if commit.message.encode('UTF-8', invalid: :replace) =~ regex }
67
64
  end
68
65
 
69
66
  def walker
@@ -12,7 +12,7 @@ module Dapp
12
12
  if hash && !res.is_a?(Hash)
13
13
  raise ::Dapp::Error::Dapp,
14
14
  code: :yaml_incorrect,
15
- data: { message: "unexpected json data \n>>> START YAML\n#{string.strip}\n>>> END YAML\n" }
15
+ data: { message: "unexpected yaml data \n>>> START YAML\n#{string.strip}\n>>> END YAML\n" }
16
16
  end
17
17
  end
18
18
  rescue Psych::SyntaxError => e
data/lib/dapp/version.rb CHANGED
@@ -1,4 +1,4 @@
1
1
  module Dapp
2
- VERSION = '0.13.9'.freeze
2
+ VERSION = '0.13.10'.freeze
3
3
  BUILD_CACHE_VERSION = 15
4
4
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: dapp
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.13.9
4
+ version: 0.13.10
5
5
  platform: ruby
6
6
  authors:
7
7
  - Dmitry Stolyarov
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2017-07-28 00:00:00.000000000 Z
11
+ date: 2017-07-31 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: mixlib-shellout