tprov 0.0.4 → 0.0.5

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: ebc7196b5e44ee5beddea6ff802e08108e8becd1
+  data.tar.gz: 9a882f706a0f503321e0596ab250e2e86e7609cc
+SHA512:
+  metadata.gz: c4221995fea6a03a199b21c6d4b5c87414ddcb1b0cf8d7cd551072e27b13de4de9ca37e44a4ad5b08338b91ca99a955bce906efc9628efa6870cd284e379916b
+  data.tar.gz: ef59e1f02f7ae6477a1c0231010303fdb1e6414ef0942c0b032cc29ea51f8a5979f53011117431fbe642078a21717ba351cfab1ff3753b20757c2707d95a7883

data/Gemfile

@@ -4,5 +4,5 @@ gem "sinatra-static-assets"
 gem "emk-sinatra-url-for"
 gem "sinatra-flash"
 gem "sinatra-redirect-with-flash"
-#gem "docker-api", :require => "docker"
+gem "docker-api", :require => "docker"
 gem "redis"

data/Gemfile.lock

@@ -1,8 +1,15 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    archive-tar-minitar (0.5.2)
+    docker-api (1.5.4)
+      archive-tar-minitar
+      excon (>= 0.22.0)
+      json
     emk-sinatra-url-for (0.2.1)
       sinatra (>= 0.9.1.1)
+    excon (0.31.0)
+    json (1.8.1)
     rack (1.5.2)
     rack-protection (1.5.0)
       rack
@@ -23,6 +30,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  docker-api
   emk-sinatra-url-for
   redis
   sinatra

data/bin/tprov

@@ -2,16 +2,14 @@
 
 $:.unshift(File.expand_path(File.join(File.dirname(__FILE__), "..", "lib")))
 
-require "rubygems"
-require "optparse"
-require "tprov"
-require "version"
+require 'rubygems'
+require 'optparse'
+require 'tprov'
+require 'version'
 
 options = {}
 
 optparse = OptionParser.new do |opts|
-  # Set a banner, displayed at the top
-  # of the help screen.
   opts.banner = "Usage: TProv [options] ..."
 
   opts.separator ''

data/lib/tprov/app.rb

@@ -1,11 +1,14 @@
 $: << File.dirname(__FILE__)
 
-require 'sinatra'
+require 'sinatra/base'
 require 'sinatra/url_for'
 require 'sinatra/static_assets'
 require 'sinatra/flash'
 require 'sinatra/redirect_with_flash'
 require 'json'
+require 'uri'
+require 'docker'
+require 'pp'
 
 module TProv
   class Application < Sinatra::Base
@@ -18,6 +21,11 @@ module TProv
     set :views, File.join(File.dirname(__FILE__), 'views')
     set :bind, '0.0.0.0'
 
+    Docker.url = ENV['DOCKER_URL'] || 'https://localhost:2375'
+    Docker.options = {
+      :ssl_verify_peer => false
+    }
+
     enable :sessions, :logging, :dump_errors, :raise_errors, :show_exceptions
 
     before do
@@ -29,12 +37,25 @@ module TProv
     end
 
     post '/tomcat/create' do
-      get_war(params[:name], params[:url])
-      redirect '/', :success => "Instance #{@domain_name} created!"
+      if params[:name].empty? or params[:url].empty?
+        redirect '/', :error => "You must specify a name and a URL."
+      end
+      success, output = get_war(params[:name], params[:url])
+      unless success
+        redirect '/', :error => "Tomcat application #{params[:name]} failed to be fetched because #{output}."
+      end
+      success, output = create_instance(params[:name])
+      unless success
+        redirect '/', :error => "Tomcat application #{params[:name]} failed to be created because #{output}."
+      end
+      redirect '/', :success => "Tomcat Application #{params[:name]} created!"
     end
 
     post '/tomcat/delete' do
-      delete_instance(params[:id])
+      success, output = delete_instance(params[:id])
+      unless success
+        redirect '/', :error => "Tomcat application #{params[:name]} failed to be deleted because #{output}."
+      end
       redirect '/', :success => "Instance #{params[:id]} deleted!"
     end
 
@@ -45,26 +66,31 @@ module TProv
 
     helpers do
       def get_war(name, url)
-        cid = `docker run --name #{name} jamtur01/fetcher`.chop
-        create_instance(name)
+        container = Docker::Container.create('Cmd' => url, 'Image' => 'jamtur01/fetcher', 'name' => name)
+        container.start
+        container.id
       end
 
       def create_instance(name)
-        cid = `docker run -P --volumes-from #{name} -d -t jamtur01/tomcat7`.chop
-        port = `docker port #{cid} 8080`.chop
+        container = Docker::Container.create('Image' => 'jamtur01/tomcat7')
+        container.start('PublishAllPorts' => true, 'VolumesFrom' => name)
+        container.id
       end
 
       def delete_instance(cid)
-        kill = `docker kill #{cid}`
+        container = Docker::Container.get(cid)
+        container.kill
       end
 
       def list_instances
         @list = {}
-        instance_ids = `docker ps -q`.split(/\n/).reject(&:empty?)
+        instance_ids = Docker::Container.all
         instance_ids.each { |id|
-          port = `docker port #{id} 8080`.chop
-          config = JSON.parse(`docker inspect #{id}`)
-          @list[id] = { 'hostname' => config[0]["Config"]["Hostname"], 'ip' => config[0]["NetworkSettings"]["IPAddress"], 'port' => port }
+          container = Docker::Container.get(id.id)
+          config = container.json
+          if config['NetworkSettings']['Ports']['8080/tcp']
+            @list[id] = { 'hostname' => config['Config']['Hostname'], 'ip' => config['NetworkSettings']['IPAddress'], 'port' => config['NetworkSettings']['Ports']['8080/tcp'][0]['HostPort'] }
+          end
         }
         @list
       end

data/lib/version.rb

@@ -1,3 +1,3 @@
 module TProv
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/tprov.gemspec

@@ -24,4 +24,5 @@ Gem::Specification.new do |s|
   s.add_dependency "sinatra-static-assets"
   s.add_dependency "emk-sinatra-url-for"
   s.add_dependency "sinatra-redirect-with-flash"
+  s.add_dependency "docker-api"
 end

metadata

@@ -1,142 +1,139 @@
 --- !ruby/object:Gem::Specification
 name: tprov
 version: !ruby/object:Gem::Version
-  version: 0.0.4
-  prerelease: 
+  version: 0.0.5
 platform: ruby
 authors:
 - James Turnbull
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-21 00:00:00.000000000 Z
+date: 2015-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sass
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra-flash
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra-static-assets
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: emk-sinatra-url-for
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra-redirect-with-flash
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: docker-api
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: A simple app to provision Tomcat apps with Docker written for The Docker
@@ -177,28 +174,28 @@ files:
 - tprov.gemspec
 homepage: http://www.dockerbook.com
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.28
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A simple app to provision Tomcat apps with Docker
 test_files:
 - spec/spec_helper.rb
 - spec/tprov_spec.rb
+has_rdoc: