dockersitter 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 89d3334696ea7dc741c3ca772685124f79c33655
-  data.tar.gz: e936e5a47c0017cb200e0a1dd980900973fca9e4
+  metadata.gz: e652b9251610f5c7799e322a5b77504da8c4cafd
+  data.tar.gz: 9e6a166004767f7ecda66226cbeb9f18c941da99
 SHA512:
-  metadata.gz: d2c4e9b173621119953d35078898be6b827b39d5ea06f2049f5b466ddde18952fcab0f450864da0f75ba73529cfe3813c8309f231877b5b26048eaa87b8fae31
-  data.tar.gz: 89d05cd37919da618b2982209c4ab7756a77ae596f050b6890be7bfeda0eb717a8d2dc8b668aa5d6135b1cc52ee8ed2ba2fceb652917861ae07a1a3cd69bb054
+  metadata.gz: b945c5650a3f32030a3bf86aba6016679efb2173ec43c6059cb5c5ddd0bc90095d962d80bce55ef2dfc6ad496ee8137ccf0608552d00a6e2c79c401651ea06ee
+  data.tar.gz: aad3a7b75ef7fb96c4081d53c352845fc788901866b9d32ac65a040ea6f742a08ade90c6541e915067e0bf31549250a08ad1def4984b9921a418928219d83534

data/lib/command_router.rb

@@ -2,7 +2,7 @@ require "commands/init"
 require 'thor'
 require 'commands/create'
 require 'commands/delete'
-require 'commands/generate_backup_scripts'
+require 'commands/generate'
 require 'commands/backup_app.rb'
 require 'commands/restore_app.rb'
 require 'commands/start.rb'
@@ -16,7 +16,7 @@ module CommandRouter
 
     register(Init, 'init', 'init', 'initializes a docker-project.')
     register(Create,'create','create','creates a new docker-unit.')
-    register(GenerateBackupScripts,'g','g','generates scripts')
+    register(Generate,'generate','generate','generates scripts')
     register(Delete,'delete','delete','deletes a docker-unit.')
     register BackupApp,'backup','backup','creates a backup of the given app.'
     register RestoreApp, 'restore','restore','restores an app.'

data/lib/commands/{generate_backup_scripts.rb → generate.rb}

@@ -1,10 +1,8 @@
 require 'fileutils'
 require 'util'
 require 'yaml'
-require 'thor'
-require 'thor/group'
 
-class GenerateBackupScripts < Thor::Group
+class Generate < Thor
   include DockerMgr::Util
   include Thor::Actions
 
@@ -12,17 +10,21 @@ class GenerateBackupScripts < Thor::Group
     File.expand_path('../templates',__dir__)
   end
 
-  argument :app_name,
-    :type => :string,
-    :desc => 'name of the app'
+  desc 'ca-installer','generates a new ca-installer package with root certificate and installation script.'
+  def ca_installer 
+    generate_ca_installer   
+  end
 
-  def generate_backup_scripts
+  
+  desc 'backup-scripts APP_NAME','generates the backup scripts for the given app.'
+  def backup_scripts(app_name)
+    @app_name = app_name
     app_path = "#{apps_dir}/#{@app_name}"
     hooks = data_services(@app_name)
     hooks << "before_all"
     hooks << "after_all"
     %w(backup restore).each do | hook_type |
-      hooks.each do | hook  |
+      hooks.each do | hook |
         @service = hook
         template_name = hook == 'before_all' || hook == 'after_all' ? hook : hook_type
         template "#{template_name}.erb","#{app_path}/administration/hooks/#{hook_type}.d/#{hook}"

data/lib/docker_mgr/version.rb

@@ -1,4 +1,4 @@
 module DockerMgr
   # docker_mgr version
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

data/lib/templates/backup.erb

@@ -1,8 +1,8 @@
 #!/bin/bash
 
-<%volumes(app_name,@service).each_with_index do |v,i|%>
+<%volumes(@app_name,@service).each_with_index do |v,i|%>
 mkdir -p $1/<%="#{@service}/#{@service}_#{i}"%>
 <%end%>
 
 data_container_id=$(sudo docker-compose ps -q <%=@service%>)
-sudo docker run --rm --volumes-from $data_container_id <%=volumes(app_name,@service).each_with_index.map{|volume,i|"-v $1/#{@service}/#{@service}_#{i}:/backup/#{@service}_#{i}"}.join(" ")%> ubuntu:14.04 /bin/bash -c '<%=volumes(app_name,@service).each_with_index.map{|v,i|"echo \"/#{v}\" > /backup/#{@service}_#{i}/backup.descriptor && tar -czpf /backup/#{@service}_#{i}/#{@service}_#{i}.tar.gz /#{v}"}.join(" && ")%>'
+sudo docker run --rm --volumes-from $data_container_id <%=volumes(@app_name,@service).each_with_index.map{|volume,i|"-v $1/#{@service}/#{@service}_#{i}:/backup/#{@service}_#{i}"}.join(" ")%> ubuntu:14.04 /bin/bash -c '<%=volumes(@app_name,@service).each_with_index.map{|v,i|"echo \"/#{v}\" > /backup/#{@service}_#{i}/backup.descriptor && tar -czpf /backup/#{@service}_#{i}/#{@service}_#{i}.tar.gz /#{v}"}.join(" && ")%>'

data/lib/templates/docker-compose.yml.erb

@@ -11,5 +11,5 @@ appdata:
   volumes:
   <%options[:volumes].each do |volume|-%>
   - <%=volume%>
-  <%end-%>
+  <%end%>
   command: /bin/echo datacontainer

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dockersitter
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Rene Richter
@@ -119,11 +119,12 @@ files:
 - gemspec.yml
 - install_certificate.tar
 - lib/command_router.rb
+- lib/commands/.generate.rb.swp
 - lib/commands/backup_app.rb
 - lib/commands/config.rb
 - lib/commands/create.rb
 - lib/commands/delete.rb
-- lib/commands/generate_backup_scripts.rb
+- lib/commands/generate.rb
 - lib/commands/increment.rb
 - lib/commands/init.rb
 - lib/commands/restore_app.rb