picobox 0.2.6 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39a5b830c2733f29c9d8dbf58508f95fde56aa94
-  data.tar.gz: a2a57a7a8af2c4cdc2bef8e7eaf37c4369ed5574
+  metadata.gz: 402514d6b3f2e61a23162e553a374ebf16b2b858
+  data.tar.gz: 64e4e09effbadcb2ee9abd0fb7be6e05b0a60035
 SHA512:
-  metadata.gz: 97e2e58e6d8288484f8a0e68deedfcf1a154a71d13fddc91c45c0c5708b4351c4872bf025c2261bc786773dec8bcc6d41d0ccd78e25e405a516f775f684fac91
-  data.tar.gz: 3e3543cb2354086dd24d4715b7b3a2e23483eb5afbed0c764b0cf58a289e29b635d9035bb56c2a93a15dcca02d891967a3f490276ed6827381db224098d5a549
+  metadata.gz: 31eb5aa3df0845d2f88c2e3d0e3a6d3e0f0ec4fcb8492e612659f8e5c3b2787cae10bdad6508252b1b67f4d3d87703dee3086d602276bde7150e9f704ce525e9
+  data.tar.gz: 2c5bbb347a212554698af4fa6d6d39c4e9f7765f058cca52c7ee2c7357583f60b99184fb4615aa9fdf026703b4c2aaf55a365bba68410941d70ccf48c1f290c3

data/.gitignore

@@ -11,6 +11,7 @@
 .picobox
 .byebug_history
 .DS_Store
+/packages
 
 # rspec failure tracking
 .rspec_status

data/README.md

@@ -131,6 +131,7 @@ $ bundle exec byebug -R localhost:8989
 - [ ] 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.rb

@@ -12,6 +12,7 @@ require 'ostruct'
 require 'yaml'
 require 'inifile'
 require 'pathname'
+require 'json'
 
 require 'picobox/utils/progress_bar'
 require 'picobox/utils/spinner'
@@ -21,6 +22,7 @@ require 'picobox/utils/domain_event_publisher'
 require 'picobox/utils/visitor_by_os'
 require 'picobox/utils/output'
 require 'picobox/utils/shell'
+require 'picobox/utils/packages'
 
 require 'picobox/docker_compose/config'
 
@@ -49,9 +51,11 @@ require 'picobox/commands/restart'
 require 'picobox/commands/ssh_instance'
 require 'picobox/commands/reload_shell'
 require 'picobox/commands/get_root_permission'
+require 'picobox/commands/update_packages'
+require 'picobox/commands/install_config'
 
 require 'picobox/boxes/manifest'
-require 'picobox/boxes/unpacker'
+require 'picobox/boxes/installer'
 
 require 'picobox/services/manifest'
 require 'picobox/services/installer'
@@ -67,6 +71,7 @@ require 'picobox/shell/startup_script'
 require 'picobox/shell/dot_profile'
 require 'picobox/shell/dot_zshrc'
 require 'picobox/shell/dot_bashrc'
+require 'picobox/shell/ini_file'
 
 require 'picobox/constants'
 require 'picobox/cli'

data/lib/picobox/box.rb

@@ -11,10 +11,6 @@ module Picobox
 
     def install(type = nil)
       return if type.nil?
-      # TODO place to inject unpacker for different types
-      # of unpacking (ie net), could first search locally
-      # then on the net
-      # accept(Commands::AddBox.new(type, FileUnpacker, NetUnpacker))
       accept(Commands::AddBox.new(type))
     rescue Errors::BoxNotImplemented
       display_box_not_available type
@@ -28,7 +24,11 @@ module Picobox
     end
 
     def list()
+      accept(Commands::UpdatePackages.new)
       accept(Commands::ListBoxes.new)
+    rescue Errors::PicoboxNotInstalled
+      display_picobox_not_installed
+      exit 1
     rescue StandardError => e
       display_info(e, :red)
       exit 1

data/lib/picobox/boxes/{unpacker.rb → installer.rb}

@@ -1,11 +1,11 @@
 module Picobox
   module Boxes
-    class Unpacker
+    class Installer
       def initialize(os)
         @os = os
       end
 
-      def unpack(type)
+      def install(type)
         @manifest = Manifest.new(os, type)
         @manifest.check! # raises an exception if we can't find the type in the manifest
 

data/lib/picobox/commands/add_box.rb

@@ -8,9 +8,9 @@ module Picobox
       def visit_darwin subject
         publish_event :add_box_start, type
 
-        raise Errors::ProjectNotInitialized unless project_initialized?
+        raise Errors::ProjectNotInitialized unless os.project_initialized?
 
-        Boxes::Unpacker.new(os).unpack(type)
+        Boxes::Installer.new(os).install(type)
       end
 
 
@@ -20,8 +20,6 @@ module Picobox
 
       private
       attr_reader :type
-
-      def project_initialized?() Utils::Project.new(os).project_initialized? end
     end
   end
 end

data/lib/picobox/commands/add_service.rb

@@ -8,7 +8,7 @@ module Picobox
       def visit_darwin subject
         publish_event :add_service_start, service
 
-        raise Errors::ProjectNotInitialized unless project_initialized?
+        raise Errors::ProjectNotInitialized unless os.project_initialized?
 
         Services::Installer.new(os).install(service)
 
@@ -22,8 +22,6 @@ module Picobox
 
       private
       attr_reader :service
-
-      def project_initialized?() Utils::Project.new(os).project_initialized? end
     end
   end
 end

data/lib/picobox/commands/initialize_project.rb

@@ -2,10 +2,17 @@ module Picobox
   module Commands
     class InitializeProject < Picobox::Utils::VisitorByOs
       def visit_darwin subject
+        raise Errors::PicoboxNotInstalled unless os.picobox_installed?
+
         publish_event :project_initialize_start
 
-        create_project_config_dir
-        create_project_ini
+        # create project config_dir
+        TTY::File.create_dir project_config_dir
+
+        # create project ini
+        TTY::File.create_file "#{project_config_dir}/#{Picobox::PROJECT_INI}" do |content|
+          "[project]\nenabled=true\n"
+        end
 
         publish_event :project_initialize_complete
       end
@@ -17,18 +24,6 @@ module Picobox
 
 
       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
-        TTY::File.create_dir project_config_dir
-      end
-
-      def create_project_ini
-        TTY::File.create_file "#{project_config_dir}/#{Picobox::PROJECT_INI}" do |content|
-          "[project]\nroot=#{os.current_dir}\n"
-        end
-      end
-
       def project_config_dir
         "#{os.current_dir}/#{Picobox::CONFIG_DIR}"
       end

data/lib/picobox/commands/install_config.rb

@@ -0,0 +1,17 @@
+module Picobox
+  module Commands
+    class InstallConfig < Picobox::Utils::VisitorByOs
+      def visit_darwin subject
+        publish_event :config_setup_start
+
+        TTY::File.create_dir os.config_dir
+        Shell::IniFile.get(os).install
+      end
+
+
+      def visit_linux subject
+        visit_darwin subject
+      end
+    end
+  end
+end

data/lib/picobox/commands/list_boxes.rb

@@ -6,7 +6,7 @@ module Picobox
 
         publish_event :list_boxes, boxes
       end
-      
+
 
       def visit_linux subject
         visit_darwin subject

data/lib/picobox/commands/remove_service.rb

@@ -8,7 +8,7 @@ module Picobox
       def visit_darwin subject
         publish_event :remove_service_start, type
 
-        raise Errors::ProjectNotInitialized unless project_initialized?
+        raise Errors::ProjectNotInitialized unless os.project_initialized?
 
         Services::Installer.new(os).uninstall(type)
 
@@ -22,8 +22,6 @@ module Picobox
 
       private
       attr_reader :type
-
-      def project_initialized?() Utils::Project.new(os).project_initialized? end
     end
   end
 end

data/lib/picobox/commands/remove_setup_shell.rb

@@ -4,8 +4,8 @@ module Picobox
       def visit_darwin subject
         publish_event :remove_shell_setup_start
 
-        delete_config_directory
-        uninstall_shell_extensions
+        TTY::File.remove_file os.config_dir, force: true
+        Shell::StartupScript.get(os).uninstall_extensions
 
         publish_event :remove_shell_setup_complete
       end
@@ -14,17 +14,6 @@ module Picobox
       def visit_linux subject
         visit_darwin subject
       end
-      
-
-      private
-      def delete_config_directory
-        TTY::File.remove_file os.config_dir, force: true
-      end
-
-      def uninstall_shell_extensions
-        script = Shell::StartupScript.get(os)
-        script.uninstall_extensions
-      end
     end
   end
 end

data/lib/picobox/commands/restart.rb

@@ -2,7 +2,9 @@ module Picobox
   module Commands
     class Restart < Picobox::Utils::VisitorByOs
       def visit_darwin subject
-        if project_running?
+        raise Errors::ProjectNotInitialized unless os.project_initialized?
+
+        if os.project_running?
           System.new(Os::CurrentOs.get).stop
           System.new(Os::CurrentOs.get).start
         else
@@ -14,9 +16,6 @@ module Picobox
       def visit_linux subject
         visit_darwin subject
       end
-
-      private
-      def project_running?() Utils::Project.new(os).running? end
     end
   end
 end

data/lib/picobox/commands/setup_shell.rb

@@ -4,11 +4,7 @@ module Picobox
       def visit_darwin subject
         publish_event :shell_setup_start
 
-        start_up_script = Shell::StartupScript.get(os)
-
-        TTY::File.create_dir os.config_dir
-
-        start_up_script.install_extensions
+        Shell::StartupScript.get(os).install_extensions
 
         publish_event :shell_setup_complete
       end

data/lib/picobox/commands/ssh_instance.rb

@@ -8,8 +8,8 @@ module Picobox
       def visit_darwin subject
         publish_event :opening_shell, service
 
-        raise Errors::ProjectNotInitialized unless project_initialized?
-        raise Errors::SystemDownError unless project_running?
+        raise Errors::ProjectNotInitialized unless os.project_initialized?
+        raise Errors::SystemDownError unless os.project_running?
 
         system "bash", "-c", "docker-compose exec #{service} bash"
       end
@@ -22,9 +22,6 @@ module Picobox
 
       private
       attr_reader :service
-
-      def project_initialized?() Utils::Project.new(os).project_initialized? end
-      def project_running?()     Utils::Project.new(os).running? end
     end
   end
 end

data/lib/picobox/commands/start.rb

@@ -4,7 +4,7 @@ module Picobox
       def visit_darwin subject
         publish_event :starting
 
-        raise Errors::ProjectNotInitialized unless project_initialized?
+        raise Errors::ProjectNotInitialized unless os.project_initialized?
 
         system("docker-compose up -d #{Picobox.output}")
         publish_event :started
@@ -14,9 +14,6 @@ module Picobox
       def visit_linux subject
         visit_darwin subject
       end
-
-      private
-      def project_initialized?() Utils::Project.new(os).project_initialized? end
     end
   end
 end

data/lib/picobox/commands/start_uninstall.rb

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

data/lib/picobox/commands/stop.rb

@@ -4,7 +4,7 @@ module Picobox
       def visit_darwin subject
         publish_event :stopping
 
-        raise Errors::ProjectNotInitialized unless project_initialized?
+        raise Errors::ProjectNotInitialized unless os.project_initialized?
 
         system("docker-compose down #{Picobox.output}")
 
@@ -15,9 +15,6 @@ module Picobox
       def visit_linux subject
         visit_darwin subject
       end
-
-      private
-      def project_initialized?() Utils::Project.new(os).project_initialized? end
     end
   end
 end

data/lib/picobox/commands/update_packages.rb

@@ -0,0 +1,30 @@
+module Picobox
+  module Commands
+    class UpdatePackages < Picobox::Utils::VisitorByOs
+      def visit_darwin subject
+        raise Errors::PicoboxNotInstalled unless os.picobox_installed?
+
+        packages = Utils::Packages.new(os)
+
+        if packages.update?
+          publish_event :update_packages_start
+
+          filename = packages.download
+
+          system("rm -rf #{Picobox.packages_dir}")
+          system("mkdir  #{Picobox.packages_dir}")
+          system("tar xvf #{filename} -C #{Picobox.packages_dir} --strip-components=1 #{Picobox.output}")
+
+          Shell::IniFile.get(os)[:packages] = { version: packages.version, last_update: Time.now.to_i }
+
+          publish_event :update_packages_stop
+        end
+      end
+
+
+      def visit_linux subject
+        visit_darwin subject
+      end
+    end
+  end
+end

data/lib/picobox/constants.rb

@@ -1,17 +1,20 @@
 module Picobox
   # names for files / directories
-  VERSION          = '0.2.6'
-  HOMEPAGE         = 'https://github.com/surzycki/picobox'
-  CONFIG_DIR       = '.picobox'
-  PROJECT_INI      = 'project.ini'
-  SHELL_EXTENSIONS = 'shell_extensions'
+  VERSION           = '0.3.0'
+  HOMEPAGE          = 'https://github.com/surzycki/picobox'
+  PACKAGES_INFO_URL = 'https://api.github.com/repos/picobox/packages/releases/latest'
+  CONFIG_DIR        = '.picobox'
+  PROJECT_INI       = 'project.ini'
+  PICOBOX_INI       = 'picobox.ini'
+  SHELL_EXTENSIONS  = 'extensions.bash'
 
 
   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 packages_dir()         "#{Picobox.root}/packages" end
+  def box_packages_dir()     "#{packages_dir}/boxes" end
+  def service_packages_dir() "#{packages_dir}/services" end
+  def extensions_dir()       "#{packages_dir}/shell" end
 
   def output()   @output end
   def verbose?() @verbose end