scalingo_databases_rake_tasks 0.1.12 → 0.2.0

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
- SHA1:
3
- metadata.gz: e32c08c7ea2188d1e99b604ad54be20edcd7a389
4
- data.tar.gz: 639da3e322e0699403957c5a894a5bfce22c16fc
2
+ SHA256:
3
+ metadata.gz: 68db7e915e5d34c810fe402d3138b9978c4fa83d62dcfa65c923df898518da6e
4
+ data.tar.gz: c549393b4acb8334110b1803936cd1f1582622587e71f15cb1d379fcc4ea6f00
5
5
  SHA512:
6
- metadata.gz: dc17e2f4b0ca00d7908c7957d237f23e17e39294aaeb2e5af072225c2703babad7c48cf3a11b69dfd6d060ea81b4865d7b5863668186b7e117892d8fe505858c
7
- data.tar.gz: c2b33b7d578f04b8df37903bea456bdd8a7431a8c6b3592a52cb10717f94f87a04f99bdf7e59cca9bd597865607b706d5b941ad49008afe7cad2e0a64443bcc8
6
+ metadata.gz: '0740018c2c1809cf8e3d1a803dacacec08d96c999befc7e683f3b6454f1648e088fa8d4506a2aeb4c05c3ffe9ee39b8267c02316c1ee98a64c956dc4e216e212'
7
+ data.tar.gz: 6fe9c95e747eb18b5a577bd436bab091bfa6e140984e6a39f87f2ee6825353129e3cfab255f1e5cb6914d1b61784c55e11ca197eb6c1df760d8a62622df659fe
data/CHANGELOG.md CHANGED
@@ -1,3 +1,7 @@
1
+ ## 0.2.0 (2019-03-15)
2
+
3
+ Make it compatible with Scalingo CLI 1.10+
4
+
1
5
  ## 0.1.12 (2017-05-29)
2
6
 
3
7
  Remove prefix path in mongodb dump archive
@@ -1,3 +1,4 @@
1
+ require 'active_support/core_ext/object/blank'
1
2
  require 'uri'
2
3
  require 'open3'
3
4
  require 'timeout'
@@ -14,7 +15,8 @@ namespace :scalingo do
14
15
  end
15
16
 
16
17
  def archive_name name = "dump"
17
- "#{Rails.root}/tmp/#{name}.tar.gz"
18
+ dir = (defined? Rails) ? "#{Rails.root}/tmp" : Dir.pwd
19
+ return "#{dir}/#{name}.tar.gz"
18
20
  end
19
21
 
20
22
  def archive_contain_sql path
@@ -55,13 +57,13 @@ namespace :scalingo do
55
57
  cmd = "scalingo -a #{app} db-tunnel -p 27717 #{variable}"
56
58
  end
57
59
  puts "*** Executing #{cmd}"
58
- i, o, thr = Open3::pipeline_rw cmd
59
- pid = thr[0].pid
60
+ i, o, thr = Open3.popen2e cmd
61
+ pid = thr.pid
60
62
  puts '*** Tunnel opened'
61
63
 
62
64
  close_tunnel = lambda {
63
- if thr[0].status
64
- thr[0].kill
65
+ if thr.status
66
+ thr.kill
65
67
  Process.kill("INT", pid) if pid != -1
66
68
  puts '*** Tunnel closed'
67
69
  end
@@ -85,7 +87,7 @@ namespace :scalingo do
85
87
  abort "*** Address 127.0.0.1:27717 is already in use."
86
88
  end
87
89
 
88
- if line.include?("'127.0.0.1:27717'")
90
+ if line.include?("\n127.0.0.1:27717\n") || line.match?(/^127.0.0.1:27717$/)
89
91
  return [pid, close_tunnel]
90
92
  elsif line.include?("'127.0.0.1:")
91
93
  abort "*** Address 127.0.0.1:27717 is already in use."
@@ -1,3 +1,5 @@
1
+ require 'active_support/core_ext/object/blank'
2
+
1
3
  namespace :scalingo do
2
4
  namespace :mongodb do
3
5
  desc "Backup local MongoDB database"
@@ -1,3 +1,5 @@
1
+ require 'tmpdir'
2
+
1
3
  namespace :scalingo do
2
4
  namespace :mysql do
3
5
  desc "Backup local MySQL database"
@@ -31,7 +33,7 @@ namespace :scalingo do
31
33
 
32
34
  module ScalingoMySQL
33
35
  DUMP_NAME = "scalingo_mysql_dump.sql"
34
- DUMP_PATH = Dir.tmpdir() + "/#{DUMP_NAME}"
36
+ DUMP_PATH = Dir.tmpdir + "/#{DUMP_NAME}"
35
37
 
36
38
  def self.local_credentials
37
39
  config = ActiveRecord::Base.configurations[Rails.env]
@@ -1,3 +1,5 @@
1
+ require 'active_support/core_ext/object/blank'
2
+
1
3
  namespace :scalingo do
2
4
  namespace :postgresql do
3
5
  desc "Backup local PostgreSQL database"
@@ -1,3 +1,3 @@
1
1
  module ScalingoDbTasks
2
- VERSION = "0.1.12"
2
+ VERSION = "0.2.0"
3
3
  end
@@ -20,4 +20,5 @@ Gem::Specification.new do |spec|
20
20
 
21
21
  spec.add_development_dependency "bundler", "~> 1.10"
22
22
  spec.add_development_dependency "rake", "~> 10.0"
23
+ spec.add_dependency "activesupport", ">= 3.0"
23
24
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: scalingo_databases_rake_tasks
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.12
4
+ version: 0.2.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Scalingo
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2017-05-29 00:00:00.000000000 Z
11
+ date: 2019-03-15 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler
@@ -38,6 +38,20 @@ dependencies:
38
38
  - - "~>"
39
39
  - !ruby/object:Gem::Version
40
40
  version: '10.0'
41
+ - !ruby/object:Gem::Dependency
42
+ name: activesupport
43
+ requirement: !ruby/object:Gem::Requirement
44
+ requirements:
45
+ - - ">="
46
+ - !ruby/object:Gem::Version
47
+ version: '3.0'
48
+ type: :runtime
49
+ prerelease: false
50
+ version_requirements: !ruby/object:Gem::Requirement
51
+ requirements:
52
+ - - ">="
53
+ - !ruby/object:Gem::Version
54
+ version: '3.0'
41
55
  description: Perform database related tasks on Scalingo.
42
56
  email:
43
57
  - hello@scalingo.com
@@ -78,8 +92,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
78
92
  - !ruby/object:Gem::Version
79
93
  version: '0'
80
94
  requirements: []
81
- rubyforge_project:
82
- rubygems_version: 2.6.11
95
+ rubygems_version: 3.0.1
83
96
  signing_key:
84
97
  specification_version: 4
85
98
  summary: Perform database related tasks on Scalingo.