tprov 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ebc7196b5e44ee5beddea6ff802e08108e8becd1
-  data.tar.gz: 9a882f706a0f503321e0596ab250e2e86e7609cc
+  metadata.gz: f38ee7a2be8de3c14bddbeca562e53ac979fcd2e
+  data.tar.gz: c016cbdd4a55cea01c7dda262d64bf736fbb3d1d
 SHA512:
-  metadata.gz: c4221995fea6a03a199b21c6d4b5c87414ddcb1b0cf8d7cd551072e27b13de4de9ca37e44a4ad5b08338b91ca99a955bce906efc9628efa6870cd284e379916b
-  data.tar.gz: ef59e1f02f7ae6477a1c0231010303fdb1e6414ef0942c0b032cc29ea51f8a5979f53011117431fbe642078a21717ba351cfab1ff3753b20757c2707d95a7883
+  metadata.gz: a8fa04951580d185992e15f19f6eead373cd3b537244833c00bbcb562ed2430aceabf5f917cc4ad81e6d89498ec0da97e7a70c54fe8050534dab23b10fede11e
+  data.tar.gz: be5f205e0df05d3d4378afa4afef6ef1dfcce3074e49852462a77b6d7cca83ede1a2f20fc17bc0fa398e023255d6a022ca2baef89acaa9269d6417bdd5b2fa91

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,15 +1,8 @@
 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
@@ -30,7 +23,6 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  docker-api
   emk-sinatra-url-for
   redis
   sinatra

data/bin/tprov

@@ -2,14 +2,16 @@
 
 $:.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,14 +1,12 @@
 $: << File.dirname(__FILE__)
 
-require 'sinatra/base'
+require 'sinatra'
 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
@@ -21,11 +19,6 @@ 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
@@ -66,31 +59,28 @@ module TProv
 
     helpers do
       def get_war(name, url)
-        container = Docker::Container.create('Cmd' => url, 'Image' => 'jamtur01/fetcher', 'name' => name)
-        container.start
-        container.id
+        cid = `docker run --name "#{name}" jamtur01/fetcher "#{url}" 2>&1`.chop
+        puts cid
+        [$?.exitstatus == 0, cid]
       end
 
       def create_instance(name)
-        container = Docker::Container.create('Image' => 'jamtur01/tomcat7')
-        container.start('PublishAllPorts' => true, 'VolumesFrom' => name)
-        container.id
+        cid = `docker run -P --volumes-from "#{name}" -d -t jamtur01/tomcat7 2>&1`.chop
+        [$?.exitstatus == 0, cid]
       end
 
       def delete_instance(cid)
-        container = Docker::Container.get(cid)
-        container.kill
+        kill = `docker kill #{cid} 2>&1`
+        [$?.exitstatus == 0, kill]
       end
 
       def list_instances
         @list = {}
-        instance_ids = Docker::Container.all
+        instance_ids = `docker ps -q`.split(/\n/).reject(&:empty?)
         instance_ids.each { |id|
-          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
+          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 }
         }
         @list
       end

data/lib/version.rb

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

data/tprov.gemspec

@@ -10,6 +10,7 @@ Gem::Specification.new do |s|
   s.homepage    = "http://www.dockerbook.com"
   s.summary     = %q{A simple app to provision Tomcat apps with Docker}
   s.description = %q{A simple app to provision Tomcat apps with Docker written for The Docker Book - http://www.dockerbook.com}
+  s.license     = "MIT"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
@@ -24,5 +25,4 @@ 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,139 +1,125 @@
 --- !ruby/object:Gem::Specification
 name: tprov
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - James Turnbull
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-25 00:00:00.000000000 Z
+date: 2016-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
   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'
 - !ruby/object:Gem::Dependency
   name: haml
   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'
 - !ruby/object:Gem::Dependency
   name: sass
   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'
 - !ruby/object:Gem::Dependency
   name: json
   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'
 - !ruby/object:Gem::Dependency
   name: sinatra-flash
   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'
 - !ruby/object:Gem::Dependency
   name: sinatra-static-assets
   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'
 - !ruby/object:Gem::Dependency
   name: emk-sinatra-url-for
   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'
 - !ruby/object:Gem::Dependency
   name: sinatra-redirect-with-flash
   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'
-- !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
@@ -145,7 +131,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -173,7 +159,8 @@ files:
 - spec/tprov_spec.rb
 - tprov.gemspec
 homepage: http://www.dockerbook.com
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -181,17 +168,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A simple app to provision Tomcat apps with Docker