skyed 0.1.8 → 0.1.9
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/skyed.rb +1 -1
- data/lib/skyed/git.rb +5 -4
- data/lib/skyed/init.rb +1 -1
- data/lib/skyed/run.rb +11 -4
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 7912136f81571d2da9daeddeb6dc1f093189bd0e
|
4
|
+
data.tar.gz: 0b46d44685062f11b9dc683ee05624a06c2682ba
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: f7c719e2f13638225df86460c39cdb22492c28e66fa9c5f636f978ab07c5b79c526fa97ad26860b2227df93bf63d01f68e5ac8d88ba5e46b1eebbe951bf6188e
|
7
|
+
data.tar.gz: 9ffdc009e20fad9e3b58bcf41ca754fc3b236609efc3c44cc82f030d2c6a7d56b177d260beb9ffcf12c5df95a5367e3a74ca1e891cda006985817e6882e5ce83
|
data/lib/skyed.rb
CHANGED
data/lib/skyed/git.rb
CHANGED
@@ -5,10 +5,11 @@ module Skyed
|
|
5
5
|
# This module encapsulates all the Git features.
|
6
6
|
module Git
|
7
7
|
class << self
|
8
|
-
def clone_stack_remote(stack)
|
9
|
-
|
10
|
-
|
11
|
-
|
8
|
+
def clone_stack_remote(stack, options)
|
9
|
+
unless Skyed::Settings.current_stack?(stack[:stack_id])
|
10
|
+
Skyed::Init.opsworks_git_key options
|
11
|
+
end
|
12
|
+
ENV['PKEY'] ||= Skyed::Settings.opsworks_git_key
|
12
13
|
Skyed::Utils.create_template('/tmp', 'ssh-git', 'ssh-git.erb')
|
13
14
|
File.chmod(0755, '/tmp/ssh-git')
|
14
15
|
ENV['GIT_SSH'] = '/tmp/ssh-git'
|
data/lib/skyed/init.rb
CHANGED
@@ -116,7 +116,7 @@ module Skyed
|
|
116
116
|
ask(question + remotes_names.to_s)
|
117
117
|
end
|
118
118
|
|
119
|
-
def opsworks_git_key(options)
|
119
|
+
def opsworks_git_key(options = nil)
|
120
120
|
question = 'Which ssh key should be used for the git repository? '
|
121
121
|
Skyed::Settings.opsworks_git_key = options[:repo_key] || ask(question)
|
122
122
|
end
|
data/lib/skyed/run.rb
CHANGED
@@ -14,9 +14,7 @@ module Skyed
|
|
14
14
|
|
15
15
|
def run(_global_options, options, args)
|
16
16
|
check_run_options(options)
|
17
|
-
ow =
|
18
|
-
Skyed::Settings.stack_id = stack(ow, options)
|
19
|
-
Skyed::Settings.layer_id = layer(ow, options)
|
17
|
+
ow = settings(options)
|
20
18
|
instances = Skyed::AWS::OpsWorks.running_instances(
|
21
19
|
{ layer_id: Skyed::Settings.layer_id },
|
22
20
|
ow)
|
@@ -25,6 +23,13 @@ module Skyed
|
|
25
23
|
execute_recipes(ow, args, instances, options)
|
26
24
|
end
|
27
25
|
|
26
|
+
def settings(options)
|
27
|
+
ow = login
|
28
|
+
Skyed::Settings.stack_id = stack(ow, options)
|
29
|
+
Skyed::Settings.layer_id = layer(ow, options)
|
30
|
+
ow
|
31
|
+
end
|
32
|
+
|
28
33
|
def update_custom_cookbooks(ow, stack_id, instances, wait = 0)
|
29
34
|
status = Skyed::AWS::OpsWorks.deploy(
|
30
35
|
stack_id: stack_id,
|
@@ -68,6 +73,7 @@ module Skyed
|
|
68
73
|
end
|
69
74
|
|
70
75
|
def check_recipes_exist(options, args)
|
76
|
+
settings(options)
|
71
77
|
if !options.nil? && options.key?(:stack) && !options[:stack].nil?
|
72
78
|
recipes = args.select { |recipe| recipe_in_remote(options, recipe) }
|
73
79
|
else
|
@@ -105,7 +111,8 @@ module Skyed
|
|
105
111
|
|
106
112
|
def recipe_in_remote(options, recipe)
|
107
113
|
clone = Skyed::Git.clone_stack_remote(
|
108
|
-
Skyed::AWS::OpsWorks.stack(options[:stack], login)
|
114
|
+
Skyed::AWS::OpsWorks.stack(options[:stack], login),
|
115
|
+
options)
|
109
116
|
recipe_in_cookbook(recipe, clone)
|
110
117
|
end
|
111
118
|
end
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: skyed
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.1.
|
4
|
+
version: 0.1.9
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Ignasi Fosch
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2015-06-
|
11
|
+
date: 2015-06-30 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: git
|