picobox 0.1.7 → 0.2.0

data/lib/picobox/commands/get_root_permission.rb

@@ -0,0 +1,14 @@
+module Picobox
+  module Commands
+    class GetRootPermission < Picobox::Utils::VisitorByOs
+      def visit_darwin subject
+        
+      end
+
+
+      def visit_linux subject
+        system "#{os.su} 'echo 1 > /dev/null'"
+      end
+    end
+  end
+end

data/lib/picobox/commands/initialize_project.rb

@@ -2,8 +2,6 @@ module Picobox
   module Commands
     class InitializeProject < Picobox::Utils::VisitorByOs
       def visit_darwin subject
-        @os = subject.os
-
         publish_event :project_initialize_start
 
         create_project_config_dir
@@ -12,9 +10,13 @@ module Picobox
         publish_event :project_initialize_complete
       end
 
-      private
-      attr_reader :os
 
+      def visit_linux subject
+        visit_darwin subject
+      end
+
+
+      private
       def create_project_config_dir
         # for now just empty dir, but eventualy add flags with ini files 'ie enabled, etc'
         # https://github.com/albfan/bash-ini-parser

data/lib/picobox/commands/install_docker.rb

@@ -2,7 +2,7 @@ module Picobox
   module Commands
     class InstallDocker < Picobox::Utils::VisitorByOs
       def visit_darwin subject
-        unless subject.os.docker_installed?
+        unless os.docker_installed?
           commands = [
             "/usr/bin/hdiutil attach -noidme -nobrowse -quiet #{subject.os.docker_installer}",
             "cp -R /Volumes/Docker/Docker.app /Applications",
@@ -10,18 +10,44 @@ module Picobox
             "/usr/bin/hdiutil unmount -quiet /Volumes/Docker"
           ]
 
-          publish_event :install_docker_start, commands.length
+          publish_event :install_docker_start
 
           commands.each do |command|
             system(command)
-            publish_event :install_docker_progress
           end
 
           publish_event :install_docker_complete
         else
-          publish_event :docker_present, subject.os.docker_version?
+          publish_event :docker_present, os.docker_version?
         end
       end
+
+
+      def visit_linux subject
+        unless os.docker_installed?        
+          commands = [
+            "curl -fsSL get.docker.com -o get-docker.sh",
+            "sh get-docker.sh #{Picobox.output}",
+            "rm get-docker.sh",
+            "#{os.su} 'usermod -aG docker #{os.user}'"
+          ]
+
+          
+          publish_event :install_docker_start
+
+          commands.each do |command|
+            system(command)
+          end
+
+          publish_event :add_post_install_message, "If you would like to use Docker as a non-root user\nyou will have to log out and back in for this to take effect!"
+
+          publish_event :install_docker_complete
+
+        else
+          publish_event :docker_present, os.docker_version?
+        end
+      end 
     end
   end
-end
+end
+

data/lib/picobox/commands/list_boxes.rb

@@ -2,15 +2,15 @@ module Picobox
   module Commands
     class ListBoxes < Picobox::Utils::VisitorByOs
       def visit_darwin subject
-        @os = subject.os
-
         boxes = Boxes::Manifest.new(os).list
 
         publish_event :list_boxes, boxes
       end
+      
 
-      private
-      attr_reader :os
+      def visit_linux subject
+        visit_darwin subject
+      end
     end
   end
 end

data/lib/picobox/commands/list_services.rb

@@ -2,15 +2,15 @@ module Picobox
   module Commands
     class ListServices < Picobox::Utils::VisitorByOs
       def visit_darwin subject
-        @os = subject.os
-
         services = Services::Manifest.new(os).list
 
         publish_event :list_services, services
       end
 
-      private
-      attr_reader :os
+
+      def visit_linux subject
+        visit_darwin subject
+      end
     end
   end
 end

data/lib/picobox/commands/reload_shell.rb

@@ -0,0 +1,15 @@
+module Picobox
+  module Commands
+    class ReloadShell < Picobox::Utils::VisitorByOs
+      def visit_darwin subject
+        publish_event :reload_shell
+        Utils::Shell.new(Os::CurrentOs.get).reload
+      end
+
+
+      def visit_linux subject
+        visit_darwin subject
+      end
+    end
+  end
+end

data/lib/picobox/commands/remove_service.rb

@@ -6,7 +6,6 @@ module Picobox
       end
 
       def visit_darwin subject
-        @os = subject.os
         publish_event :remove_service_start, type
 
         raise Errors::ProjectNotInitialized unless project_initialized?
@@ -16,8 +15,13 @@ module Picobox
         publish_event :remove_service_completed, type
       end
 
+
+      def visit_linux subject
+        visit_darwin subject
+      end
+
       private
-      attr_reader :os, :type
+      attr_reader :type
 
       def project_initialized?() Utils::Project.new(os).project_initialized? end
     end

data/lib/picobox/commands/remove_setup_shell.rb

@@ -2,8 +2,6 @@ module Picobox
   module Commands
     class RemoveSetupShell < Picobox::Utils::VisitorByOs
       def visit_darwin subject
-        @os = subject.os
-
         publish_event :remove_shell_setup_start
 
         delete_config_directory
@@ -12,9 +10,13 @@ module Picobox
         publish_event :remove_shell_setup_complete
       end
 
-      private
-      attr_reader :os
 
+      def visit_linux subject
+        visit_darwin subject
+      end
+      
+
+      private
       def delete_config_directory
         TTY::File.remove_file os.config_dir, force: true
       end

data/lib/picobox/commands/restart.rb

@@ -2,19 +2,20 @@ module Picobox
   module Commands
     class Restart < Picobox::Utils::VisitorByOs
       def visit_darwin subject
-        @os = subject.os
-
         if project_running?
-          Picobox::CLI.new.stop
-          Picobox::CLI.new.start
+          System.new(Os::CurrentOs.get).stop
+          System.new(Os::CurrentOs.get).start
         else
-          Picobox::CLI.new.start
+          System.new(Os::CurrentOs.get).start
         end
       end
 
-      private
-      attr_reader :os
 
+      def visit_linux subject
+        visit_darwin subject
+      end
+
+      private
       def project_running?() Utils::Project.new(os).running? end
     end
   end

data/lib/picobox/commands/setup_shell.rb

@@ -2,18 +2,21 @@ module Picobox
   module Commands
     class SetupShell < Picobox::Utils::VisitorByOs
       def visit_darwin subject
-        @os = subject.os
-
         publish_event :shell_setup_start
 
-        start_up_script = Shell::StartupScript.get(@os)
+        start_up_script = Shell::StartupScript.get(os)
 
-        TTY::File.create_dir @os.config_dir
+        TTY::File.create_dir os.config_dir
 
         start_up_script.install_extensions
 
         publish_event :shell_setup_complete
       end
+
+
+      def visit_linux subject
+        visit_darwin subject
+      end
     end
   end
 end

data/lib/picobox/commands/{open_shell.rb → ssh_instance.rb}

@@ -1,13 +1,11 @@
 module Picobox
   module Commands
-    class OpenShell < Picobox::Utils::VisitorByOs
+    class SshInstance < Picobox::Utils::VisitorByOs
       def initialize(service)
         @service = service
       end
 
       def visit_darwin subject
-        @os = subject.os
-
         publish_event :opening_shell, service
 
         raise Errors::ProjectNotInitialized unless project_initialized?
@@ -16,8 +14,14 @@ module Picobox
         system "bash", "-c", "docker-compose exec #{service} bash"
       end
 
+
+      def visit_linux subject
+        visit_darwin subject
+      end
+
+
       private
-      attr_reader :service, :os
+      attr_reader :service
 
       def project_initialized?() Utils::Project.new(os).project_initialized? end
       def project_running?()     Utils::Project.new(os).running? end

data/lib/picobox/commands/start.rb

@@ -2,19 +2,20 @@ module Picobox
   module Commands
     class Start < Picobox::Utils::VisitorByOs
       def visit_darwin subject
-        @os = subject.os
-
         publish_event :starting
 
         raise Errors::ProjectNotInitialized unless project_initialized?
 
-        system('docker-compose up -d 2>/dev/null') unless project_running?
+        system("docker-compose up -d #{Picobox.output}") unless project_running?
         publish_event :started
       end
 
-      private
-      attr_reader :os
 
+      def visit_linux subject
+        visit_darwin subject
+      end
+
+      private
       def project_initialized?() Utils::Project.new(os).project_initialized? end
       def project_running?()     Utils::Project.new(os).running? end
     end

data/lib/picobox/commands/start_install.rb

@@ -4,6 +4,11 @@ module Picobox
       def visit_darwin subject
         publish_event :install_started
       end
+
+
+      def visit_linux subject
+        publish_event :install_started
+      end
     end
   end
 end

data/lib/picobox/commands/start_uninstall.rb

@@ -2,16 +2,17 @@ module Picobox
   module Commands
     class StartUninstall < Picobox::Utils::VisitorByOs
       def visit_darwin subject
-        @os = subject.os
-
         raise Errors::PicoboxNotInstalled unless picobox_installed?
 
         publish_event :uninstall_started
       end
 
-      private
-      attr_reader :os
+     
+      def visit_linux subject
+        visit_darwin subject
+      end
 
+      private
       def picobox_installed?
         File.exist? os.config_dir
       end

data/lib/picobox/commands/stop.rb

@@ -2,21 +2,22 @@ module Picobox
   module Commands
     class Stop < Picobox::Utils::VisitorByOs
       def visit_darwin subject
-        @os = subject.os
-
         publish_event :stopping
 
         raise Errors::ProjectNotInitialized unless project_initialized?
 
-        system('docker-compose down 2>/dev/null') if project_running?
+        system("docker-compose down #{Picobox.output}") if project_running?
 
 
         publish_event :stopped
       end
 
-      private
-      attr_reader :os
 
+      def visit_linux subject
+        visit_darwin subject
+      end
+
+      private
       def project_initialized?() Utils::Project.new(os).project_initialized? end
       def project_running?()     Utils::Project.new(os).running? end
     end

data/lib/picobox/constants.rb

@@ -1,14 +1,27 @@
 module Picobox
   # names for files / directories
-  VERSION          = '0.1.7'
+  VERSION          = '0.2.0'
   HOMEPAGE         = 'https://github.com/surzycki/picobox'
   CONFIG_DIR       = '.picobox'
   PROJECT_INI      = 'project.ini'
   SHELL_EXTENSIONS = 'shell_extensions'
 
+
   module_function
   def root()                 File.expand_path('../../..', __FILE__) end
   def template_dir()         "#{Picobox.root}/lib/picobox/templates" end
   def box_packages_dir()     "#{Picobox.root}/lib/picobox/boxes/packages" end
   def service_packages_dir() "#{Picobox.root}/lib/picobox/services/packages" end
+
+  def output()   @output end
+  def verbose?() @verbose end
+
+  def set_verbosity(value)
+    @verbose = value
+    if @verbose
+      @output = '2>&1'
+    else
+      @output = '> /dev/null 2>&1'
+    end
+  end
 end

data/lib/picobox/errors/picobox_error.rb

@@ -11,5 +11,6 @@ module Picobox
     class UnsupportedOsError < PicoboxError; end
     class FileNotFoundError < PicoboxError; end
     class PicoboxNotInstalled < PicoboxError; end
+    class DistroNotSupported < PicoboxError; end
   end
 end

data/lib/picobox/handlers/stdout_handler.rb

@@ -14,17 +14,21 @@ module Picobox
         display_line   '-------------------------------'
       end
 
-      def post_install_messages
-        display_line   ''
-        display_line   'You should reload open shells to pick up shell changes'
-        display_line   ''
-        display_status 'opening', 'new shell'
-        display_line   ''
+      def add_post_install_message(message)
+        @post_install_messages = (@post_install_messages || Array.new).push message
       end
 
+      def post_install_messages        
+        display_line   ''
+
+        @post_install_messages.each do |message|
+          display_line message
+          display_line   ''
+        end
+      end
 
       def docker_present(version)
-        display_info("#{version.strip} present", :green)
+        display_info("#{version.capitalize} present", :green)
       end
 
       def download_docker_start(size)
@@ -32,24 +36,29 @@ module Picobox
         Utils::ProgressBar.new(size)
       end
 
-      def download_docker_progress(progress)
+      def download_progress(progress)
         Utils::ProgressBar.step(progress)
       end
 
       def download_docker_complete()
-        display_info('[green]Preparing to install Docker[/]')
+        display_info('Preparing to install Docker', :green)
       end
 
-      def install_docker_start(size)
-        display_info('Installing Docker', :green)
+      def download_docker_compose_start(size)
+        display_info('Downloading Docker Compose', :green)
         Utils::ProgressBar.new(size)
       end
 
-      def install_docker_progress
-        Utils::ProgressBar.increment
+      def download_docker_compose_complete()
+        display_info('Preparing to install Docker Compose', :green)
+      end
+
+      def install_docker_start()
+        Utils::Spinner.new('Installing Docker')   
       end
 
       def install_docker_complete()
+        Utils::Spinner.stop
         display_info('Installed Docker', :green)
       end
 
@@ -57,6 +66,11 @@ module Picobox
         display_info('Setting up Shell', :green)
       end
 
+      def reload_shell
+        display_status 'opening', 'new shell'
+        display_line   ''
+      end
+
       def remove_shell_setup_start
         display_info('Removing shell extentions', :green)
       end
@@ -84,6 +98,15 @@ module Picobox
         display_info("Adding #{type} box", :green)
       end
 
+      def build_service_start(service)
+        Utils::Spinner.new("Building Service #{service} (5-10min)")  
+      end
+
+      def build_service_stop
+        Utils::Spinner.stop
+        display_info("Service built", :green)
+      end
+
       def list_boxes(boxes)
         display_info("Available boxes:", :green)
 
@@ -108,7 +131,6 @@ module Picobox
         display_info("Service #{type} added", :green)
       end
 
-
       def remove_service_start(type)
         display_info("Removing #{type} service", :green)
       end
@@ -118,18 +140,20 @@ module Picobox
       end
 
       def stopping
-        display_info("Picobox stopping...", :green)
+        Utils::Spinner.new('Picobox stopping')
       end
 
       def stopped
+        Utils::Spinner.stop
         display_info("Picobox stopped!", :green)
       end
 
       def starting
-        display_info("Picobox starting...", :green)
+        Utils::Spinner.new('Picobox starting')
       end
 
       def started
+        Utils::Spinner.stop
         display_info("Picobox started!", :green)
       end