picobox 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 475edf01fc2f21de1b7200dc0559ceb2431e879a
-  data.tar.gz: 719c2471673127f21bfc025e6235c190499e2f01
+  metadata.gz: 8ed4f8c0e2dec278d5f4cfd6978f567b7ac41c3b
+  data.tar.gz: bc23fbcb13649a2b223d982510a485b0e064ffaa
 SHA512:
-  metadata.gz: 9dd433d1bb5e55d655d35b041ef528c2675a80f1cb440f3ba714344825203130b16447b31c2cce8f7a6c2d72eba2d33645d26aa61011cecfc4f3ef504f588112
-  data.tar.gz: 92a7e808490894bb9c81410e6b85ddc3bd378794fe2e06de049e1b7cb7e5fcbc38027652c36b2825b89632a4dd80f8336c81cadaeda47bb4df86358a3e67ea94
+  metadata.gz: fc143f7f5f712ac59aa1afa3b40481208a6c939aad3190940aa30633089057ea898ec86e916ed189af650f74f71ab8d5ca04fe1eabd6c74ce29b51ab4ca1b817
+  data.tar.gz: d1100aede4e1e63558ff2416e9d94433114f73c0f7721a747f68fcc8a11fb7fbd13346ec2d2d3ce55bcbb17c66abdc45bb80dd63560c0173d7c4ce8f2cc29a47

data/README.md

@@ -130,7 +130,7 @@ $ bundle exec byebug -R localhost:8989
 - [ ] Block most commands if picobox not installed
 - [ ] Some services should install thier own volumes
 - [ ] Box update function
-
+- [ ] Remove TTY::File, TTY::Prompt dependency (needs native extensions)
 **http://blog.cloud66.com/using-ssh-private-keys-securely-in-docker-build/
 
 ## Contributing

data/lib/picobox/boxes/packages/rails/Dockerfile

@@ -64,9 +64,6 @@ RUN apt-get install -y nano git
 # make nano work
 RUN echo "export TERM=xterm" >> /etc/bash.bashrc
 
-# hook up cache volume
-ENV BUNDLE_PATH /bundle
-
 # working dir
 WORKDIR $APP_HOME
 

data/lib/picobox/boxes/packages/rails/docker-compose.yml

@@ -15,7 +15,6 @@ services:
     - bundle
     environment:
       RAILS_ENV: development
-      BUNDLE_PATH: "/bundle"
     hostname: picobox
     ports:
     - 80:3000
@@ -29,7 +28,6 @@ services:
     - bundle
     environment:
       RAILS_ENV: test
-      BUNDLE_PATH: "/bundle"
     hostname: picobox_test
   webpack:
     build: "."
@@ -40,11 +38,10 @@ services:
     - ".:/var/www:cached"
     environment:
       RAILS_ENV: development
-      BUNDLE_PATH: "/bundle"
     hostname: picobox
     ports:
     - 8080:8080
   bundle:
     image: busybox
     volumes:
-    - bundle-data:/bundle:cached
+    - bundle-data:/usr/local/bundle:cached

data/lib/picobox/boxes/packages/ruby/Dockerfile

@@ -36,9 +36,6 @@ RUN apt-get install -y nano git
 # make nano work
 RUN echo "export TERM=xterm" >> /etc/bash.bashrc
 
-# hook up cache volume
-ENV BUNDLE_PATH /bundle
-
 # working dir
 WORKDIR $APP_HOME
 

data/lib/picobox/boxes/packages/ruby/docker-compose.yml

@@ -13,10 +13,8 @@ services:
     - ".:/var/www:cached"
     volumes_from:
     - bundle
-    environment:
-      BUNDLE_PATH: "/bundle"
     hostname: picobox
   bundle:
     image: busybox
     volumes:
-    - bundle-data:/bundle:cached
+    - bundle-data:/usr/local/bundle:cached

data/lib/picobox/commands/get_root_permission.rb

@@ -2,7 +2,7 @@ module Picobox
   module Commands
     class GetRootPermission < Picobox::Utils::VisitorByOs
       def visit_darwin subject
-        
+
       end
 
 

data/lib/picobox/constants.rb

@@ -1,6 +1,6 @@
 module Picobox
   # names for files / directories
-  VERSION          = '0.2.4'
+  VERSION          = '0.2.5'
   HOMEPAGE         = 'https://github.com/surzycki/picobox'
   CONFIG_DIR       = '.picobox'
   PROJECT_INI      = 'project.ini'

data/lib/picobox/os/abstract.rb

@@ -8,17 +8,19 @@ module Picobox
         def config_dir()  "#{home_dir}/#{Picobox::CONFIG_DIR}" end
 
         def shell_extensions() "#{config_dir}/#{Picobox::SHELL_EXTENSIONS}" end
+        def user()             "#{ENV['USER']}" end
         def user_shell()       "#{ENV['SHELL']}"  end
 
         # download and install
-        def docker_filename()    end
-        def docker_url()         end
-        def docker_installer()   end
-        def docker_installed?()  end
+        def docker_filename()           end
+        def docker_url()                end
+        def docker_installer()          end
+        def docker_installed?()         end
+        def docker_compose_installed?() end
 
         def docker_version?()         `docker --version`.strip end
         def docker_compose_version?() `docker-compose --version`.strip end
-        
+
         def to_s() raise ::NotImplementedError, 'must override to_s' end
 
         def project_root() Utils::Project.new(self).root end

data/lib/picobox/os/darwin.rb

@@ -6,7 +6,12 @@ module Picobox
         def docker_filename() 'Docker.dmg' end
         def docker_url()       "https://download.docker.com/mac/stable/#{docker_filename}" end
         def docker_installer() "#{tmp_dir}/#{docker_filename}" end
-        def docker_installed?() File.exist?('/Applications/Docker.app') end
+
+        def docker_installed?()        File.exist?('/Applications/Docker.app') end
+        def docker_compose_installed() true end
+
+        def distro() :darwin end
+        def su()     Os::Distro.su(self) end
 
         def to_s() :darwin end
       end

data/lib/picobox/os/distro.rb

@@ -1,12 +1,12 @@
 module Picobox
   module Os
-    class Distro 
+    class Distro
       class << self
         def distro
           case `lsb_release -ids`.strip
           when /(Ubuntu)/
             :ubuntu
-          when /(Debian)/	
+          when /(Debian)/
             :debian
           when /(Fedora)/
             :fedora
@@ -20,10 +20,17 @@ module Picobox
             'sh -c'
           elsif TTY::Which.exist?('sudo')
             'sudo -E sh -c'
-          elsif TTY::Which.exist?('su')
-            'su -c'
           else
-            raise StandardError, "Error: this installer needs the ability to run commands as root.\n  We are unable to find either 'sudo' or 'su' available to make this happen."
+            message = <<-END.gsub(/^\s+\|/, '')
+              |This installer needs the ability to run commands as root.
+              |  We are unable to find 'sudo' available to make this happen.
+              |
+              |  Either:
+              |    * Install sudo and add yourself to sudoers
+              |    * Run as root
+              |
+            END
+            raise StandardError, message
           end
         end
       end

data/lib/picobox/os/linux.rb

@@ -3,20 +3,18 @@ module Picobox
     class Linux < Abstract
       class << self
         def to_s() :linux end
-      	
+
         def docker_installed?()         TTY::Which.exist?('docker') end
         def docker_compose_installed?() TTY::Which.exist?('docker-compose') end
 
         def docker_compose_url() "https://github.com/docker/compose/releases/download/1.16.1/docker-compose-Linux-#{self.arch}" end
         def docker_compose()     "/usr/local/bin/docker-compose" end
 
-        def user() "#{ENV['USER']}" end
-
       	def release() `lsb_release -cs`.strip  end
         def kernel()  `uname -r`.strip  end
         def arch()    `uname -m`.strip end
        	def distro()  Os::Distro.distro end
-      	def su()      Os::Distro.su(self) end 
+      	def su()      Os::Distro.su(self) end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: picobox
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Stefan Surzycki