gaptool-server 0.7.1 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 91476ed75e704cd7168262de3aee3563632c6571
-  data.tar.gz: 6e20d2d9cfd1f1e6d386bf3f8b801ef353cae179
+  metadata.gz: 3fe780828627a2729cb25b73f9621d11a030dfc5
+  data.tar.gz: 0e25f2f0b1d5b16a59556bbb9436dd6018662dea
 SHA512:
-  metadata.gz: db20d97b206b75e2753165da1eb30047ff8afede719f0e262477773187d19b916ec1fd9d3faae18a3e6fab08524d62fc9233c4affd0e90e9ef77634da105fbf8
-  data.tar.gz: c56b3aa929695a7b9948580ad0c65e0fdaf76c2df6d0d35d4c2c122eb0f77ca21898b46ba0a867c7014c20b7c532b73b6a44eb11e063719e2d8b201066247d9d
+  metadata.gz: d51261d37954470fca761afe83357e6a44a6f1b8aa2fdeb214e402e41938687668a44293ee4d206c43f3d9246d07133c531e418717f497f2f7a3e973d6316822
+  data.tar.gz: 0f2cf85707b65a8c09e14c658e74be25039b82e3abaf3280dac85ac79e98ee028d287005609db6ff0d9284ee7206f52264094bb58bfa1eaf0a1d4fb43a67a859

data/VERSION

@@ -1 +1 @@
-0.7.1
+0.7.3

data/tasks/docker.rb

@@ -6,7 +6,7 @@ unless File.exists?('/.dockerenv')
   namespace :docker do
     namespace :build do
       task :image do
-        sys(%w(./scripts/build_docker_images.sh))
+        sys(%w(./scripts/build_docker_images.sh -l))
         printimages
       end
 

data/tasks/role.rb

@@ -1,3 +1,5 @@
+require 'pp'
+
 namespace :role do
   desc "Set security group for a role"
   task :set_sg, [:role, :environment, :security_group] do |t, args|
@@ -6,4 +8,46 @@ namespace :role do
     role['sg'].merge!(args[:environment] => args[:security_group])
     DH.save_role_data(args[:role], role)
   end
+
+  desc "Set ami for role"
+  task :set_amis, [:role, :region, :ami_id] do |t, args|
+    abort("Missing parameters") if args[:role].nil? || args[:region].nil? || args[:role].empty? || args[:region].empty? || args[:ami_id].nil? || args[:ami_id].empty?
+    role = DH.get_role_data(args[:role])
+    role['amis'].merge!(args[:region], args[:ami_id])
+    DH.save_role_data(args[:role], role)
+  end
+
+  desc "Set runlist for role; Runlist must be a comma separated string of recipes and roles. e.g. 'recipe[recipe],role[otherrole]'"
+  task :set_chef_runlist, [:role, :chef_runlist] do |t, args|
+    abort("Missing parameters") if args[:role].nil? || args[:chef_runlist].nil? || args[:role].empty? || args[:chef_runlist].empty?
+    role = DH.get_role_data(args[:role])
+    rl = args[:chef_runlist].strip.split(",").map{|x| x.strip}.to_json
+    role['chef_runlist'] = rl
+    DH.save_role_data(args[:role], role)
+    puts "Added runlist for role #{role}"
+  end
+
+  desc "Remove a role, if there are no instances running"
+  task :remove, [:role] do |t, args|
+    abort("Missing parameters") if args[:role].nil? || args[:role].empty?
+    res = DH.remove_role(args[:role])
+    if res == true
+      puts "Removed role #{args[:role]}"
+    else
+      puts "Cannot remove role: #{res.inspect}"
+    end
+  end
+end
+
+desc "List all roles (environment is optional but needed to display apps)"
+task :role, [:environment] do |t, args|
+  env = args[:environment]
+  puts "Roles:"
+  DH.roles(env).each do |role, info|
+    puts "* #{role}:"
+    puts "  - apps: #{info['apps'].join(", ")}"
+    puts "  - sg: #{info['sg'].values.join(", ")}"
+    puts "  - amis: #{info['amis'].map{|k,v| "#{v} (#{k})"}.join(", ")}"
+    puts "  - runlist: #{info['chef_runlist'].to_a.join(", ")}"
+  end
 end

data/test/data_test.rb

@@ -106,7 +106,7 @@ describe "data helpers" do
     DH.save_role_data("role", chef_runlist: ["recipe[myrecipe]"].to_json)
     DH.addserver(instid, data, nil)
     role = DH.get_role_data("role", "testenv")
-    expect(role).to eq({"chef_runlist"=> ["recipe[myrecipe]"].to_json,
+    expect(role).to eq({"chef_runlist"=> ["recipe[myrecipe]"],
                         "apps" => [],
                         "amis" => {},
                         "sg" => {}})

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gaptool-server
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.3
 platform: ruby
 authors:
 - Matt Bailey
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-09 00:00:00.000000000 Z
+date: 2015-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra