picobox 0.2.6 → 0.3.0

data/lib/picobox/handlers/stdout_handler.rb

@@ -18,7 +18,7 @@ module Picobox
         @post_install_messages = (@post_install_messages || Array.new).push message
       end
 
-      def post_install_messages        
+      def post_install_messages
         display_line   ''
 
         @post_install_messages.each do |message|
@@ -54,7 +54,7 @@ module Picobox
       end
 
       def install_docker_start()
-        Utils::Spinner.new('Installing Docker')   
+        Utils::Spinner.new('Installing Docker')
       end
 
       def install_docker_complete()
@@ -99,7 +99,7 @@ module Picobox
       end
 
       def build_service_start(service)
-        Utils::Spinner.new("Building Service #{service} (5-10min)")  
+        Utils::Spinner.new("Building Service #{service} (5-10min)")
       end
 
       def build_service_stop
@@ -161,6 +161,19 @@ module Picobox
         display_info("Getting shell", :green)
         display_status('open', "Running \e[33m#{service}\e[0m shell", :green)
       end
+
+      def update_packages_start
+        Utils::Spinner.new('Updating packages')
+      end
+
+      def update_packages_stop
+        Utils::Spinner.stop
+        display_info("Packages updated!", :green)
+      end
+
+      def config_setup_start
+        display_info("Setting up Config", :green)
+      end
     end
   end
 end

data/lib/picobox/os/abstract.rb

@@ -25,6 +25,10 @@ module Picobox
 
         def project_root() Utils::Project.new(self).root end
         def reload_shell() system("exec #{user_shell} -l") end
+
+        def picobox_installed?()   File.exist? config_dir end
+        def project_initialized?() Utils::Project.new(self).project_initialized? end
+        def project_running?()     Utils::Project.new(self).running? end
       end
     end
   end

data/lib/picobox/os/distro.rb

@@ -16,18 +16,24 @@ module Picobox
         end
 
         def su(os)
-          su ||= if os.user == 'root'
-            'sh -c'
-          elsif TTY::Which.exist?('sudo')
+          su ||= if TTY::Which.exist?('sudo') && os.user != 'root'
             'sudo -E sh -c'
+          elsif os.user == 'root'
+            message = <<-END.gsub(/^\s+\|/, '')
+              |Not a great idea to install things as root user.
+              |
+              |  You need to:
+              |    * Install sudo and add yourself to sudoers
+              |
+            END
+            raise StandardError, message
           else
             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:
+              |  You need to:
               |    * Install sudo and add yourself to sudoers
-              |    * Run as root
               |
             END
             raise StandardError, message

data/lib/picobox/project.rb

@@ -11,6 +11,9 @@ module Picobox
 
     def init
       accept(Commands::InitializeProject.new)
+    rescue Errors::PicoboxNotInstalled
+      display_picobox_not_installed
+      exit 1
     rescue StandardError => e
       display_info(e, :red)
       exit 1

data/lib/picobox/service.rb

@@ -55,7 +55,11 @@ module Picobox
 
 
     def list()
+      accept(Commands::UpdatePackages.new)
       accept(Commands::ListServices.new)
+    rescue Errors::PicoboxNotInstalled
+      display_picobox_not_installed
+      exit 1
     rescue StandardError => e
       display_info(e, :red)
       exit 1

data/lib/picobox/shell/ini_file.rb

@@ -0,0 +1,38 @@
+module Picobox
+  module Shell
+    class IniFile
+      class << self
+        def get(os)
+          self.new(os)
+        end
+      end
+
+      def initialize(os)
+        @os = os
+      end
+
+      def install
+        TTY::File.create_file filename do |content|
+          "[packages]\nversion=v0.0\nlast_update=#{Time.now.to_i}\n"
+        end unless File.exist? filename
+      end
+
+
+      def [](key)
+        ini_file[key]
+      end
+
+
+      def []=(section, value)
+        ini_file[section.to_s] = value
+        ini_file.save
+      end
+
+      private
+      attr_reader :os
+
+      def filename() "#{os.config_dir}/#{Picobox::PICOBOX_INI}" end
+      def ini_file() @ini_file ||= ::IniFile.load(filename) end
+    end
+  end
+end

data/lib/picobox/shell/startup_script.rb

@@ -23,7 +23,7 @@ module Picobox
       end
 
       def install_extensions
-        source  = "#{Picobox.template_dir}/shell_extensions.bash"
+        source  = "#{Picobox.extensions_dir}/extensions.bash"
         dest    = os.shell_extensions
 
         TTY::File.copy_file source, dest
@@ -34,14 +34,16 @@ module Picobox
           )
       end
 
+
       def uninstall_extensions
         TTY::File.gsub_file filename, /#{Regexp.escape(extension)}/ do
           "# picobox removed #{Time.now}"
         end
       end
 
+
       def filename
-        raise ::NotImplementedError, 'must filename'
+        raise ::NotImplementedError, 'must have filename'
       end
 
       private

data/lib/picobox/system.rb

@@ -14,6 +14,8 @@ module Picobox
       accept(Commands::GetRootPermission.new)
       accept(Commands::DownloadDocker.new)
       accept(Commands::InstallDocker.new)
+      accept(Commands::InstallConfig.new)
+      accept(Commands::UpdatePackages.new)
       accept(Commands::SetupShell.new)
       accept(Commands::FinishInstall.new)
       accept(Commands::ReloadShell.new)
@@ -66,6 +68,9 @@ module Picobox
 
     def restart
       accept(Commands::Restart.new)
+    rescue Errors::ProjectNotInitialized
+      display_project_not_initialized
+      exit 1
     rescue StandardError => e
       display_info(e, :red)
       exit 1

data/lib/picobox/utils/output.rb

@@ -19,7 +19,7 @@ module Picobox
 
       def display_project_not_initialized
         display_status('error', 'no project found', :red)
-        display_info("Run command in a project directory or create new project with 'picobox init [BOX]'", :green)
+        display_info("Run 'picobox init [BOX]'", :yellow)
       end
 
 
@@ -58,6 +58,7 @@ module Picobox
 
       def display_picobox_not_installed
         display_info "Picobox not installed!", :red
+        display_info "Run: picobox install", :yellow
       end
 
 

data/lib/picobox/utils/packages.rb

@@ -0,0 +1,37 @@
+module Picobox
+  module Utils
+    class Packages
+      def version() info['tag_name'] end
+      def url()     info['tarball_url'] end
+
+      def initialize(os)
+        @os = os
+      end
+
+      def update?
+        installed_version = Picobox::Shell::IniFile.get(os)['packages']['version']
+        available_version = version
+
+        available_version > installed_version
+      end
+
+      def download
+        IO.copy_stream(
+          open(url),
+          "#{os.tmp_dir}/packages_#{version}.tar"
+        )
+
+        "#{os.tmp_dir}/packages_#{version}.tar"
+      end
+
+      private
+      attr_reader :os
+
+      def info
+        @info ||= JSON.parse(
+          open(Picobox::PACKAGES_INFO_URL).read
+        )
+      end
+    end
+  end
+end

data/picobox.gemspec

@@ -31,10 +31,11 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'aruba-turnip', '0.1.1'
   spec.add_development_dependency 'turnip'
   spec.add_development_dependency 'aruba-doubles'
-  spec.add_development_dependency 'aruba', '0.14.2'
+  spec.add_development_dependency 'aruba',        '0.14.2'
   spec.add_development_dependency 'rb-readline'
   spec.add_development_dependency 'guard'
   spec.add_development_dependency 'guard-rspec'
+  spec.add_development_dependency 'webmock'
 
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: picobox
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.3.0
 platform: ruby
 authors:
 - Stefan Surzycki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-20 00:00:00.000000000 Z
+date: 2017-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug
@@ -150,6 +150,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -315,21 +329,8 @@ files:
 - bin/setup
 - lib/picobox.rb
 - lib/picobox/box.rb
+- lib/picobox/boxes/installer.rb
 - lib/picobox/boxes/manifest.rb
-- lib/picobox/boxes/packages/elixir/Dockerfile
-- lib/picobox/boxes/packages/elixir/docker-compose.yml
-- lib/picobox/boxes/packages/elixir/info
-- lib/picobox/boxes/packages/elixir/start
-- lib/picobox/boxes/packages/python/Dockerfile
-- lib/picobox/boxes/packages/python/docker-compose.yml
-- lib/picobox/boxes/packages/python/start
-- lib/picobox/boxes/packages/rails/Dockerfile
-- lib/picobox/boxes/packages/rails/docker-compose.yml
-- lib/picobox/boxes/packages/rails/start
-- lib/picobox/boxes/packages/ruby/Dockerfile
-- lib/picobox/boxes/packages/ruby/docker-compose.yml
-- lib/picobox/boxes/packages/ruby/start
-- lib/picobox/boxes/unpacker.rb
 - lib/picobox/cli.rb
 - lib/picobox/commands/add_box.rb
 - lib/picobox/commands/add_service.rb
@@ -339,6 +340,7 @@ files:
 - lib/picobox/commands/finish_uninstall.rb
 - lib/picobox/commands/get_root_permission.rb
 - lib/picobox/commands/initialize_project.rb
+- lib/picobox/commands/install_config.rb
 - lib/picobox/commands/install_docker.rb
 - lib/picobox/commands/list_boxes.rb
 - lib/picobox/commands/list_services.rb
@@ -352,6 +354,7 @@ files:
 - lib/picobox/commands/start_install.rb
 - lib/picobox/commands/start_uninstall.rb
 - lib/picobox/commands/stop.rb
+- lib/picobox/commands/update_packages.rb
 - lib/picobox/constants.rb
 - lib/picobox/dns.rb
 - lib/picobox/docker_compose/config.rb
@@ -367,20 +370,15 @@ files:
 - lib/picobox/service.rb
 - lib/picobox/services/installer.rb
 - lib/picobox/services/manifest.rb
-- lib/picobox/services/packages/elasticsearch/config.yml
-- lib/picobox/services/packages/memcached/config.yml
-- lib/picobox/services/packages/mongodb/config.yml
-- lib/picobox/services/packages/mysql/config.yml
-- lib/picobox/services/packages/postgres/config.yml
-- lib/picobox/services/packages/redis/config.yml
 - lib/picobox/shell/dot_bashrc.rb
 - lib/picobox/shell/dot_profile.rb
 - lib/picobox/shell/dot_zshrc.rb
+- lib/picobox/shell/ini_file.rb
 - lib/picobox/shell/startup_script.rb
 - lib/picobox/system.rb
-- lib/picobox/templates/shell_extensions.bash
 - lib/picobox/utils/domain_event_publisher.rb
 - lib/picobox/utils/output.rb
+- lib/picobox/utils/packages.rb
 - lib/picobox/utils/progress_bar.rb
 - lib/picobox/utils/project.rb
 - lib/picobox/utils/shell.rb

data/lib/picobox/boxes/packages/elixir/Dockerfile

@@ -1,52 +0,0 @@
-# picobox with elixir
-#
-# VERSION               0.1.0
-
-# Change this for different versions of ruby (see https://hub.docker.com/_/elixir/)
-# FROM elixir:1.4-slim
-# FROM elixir:1.3-slim
-
-FROM elixir:slim
-MAINTAINER Stefan Surzycki <stefan.surzycki@gmail.com>
-
-ENV HOSTNAME picobox
-ENV APP_HOME /var/www
-
-# silence deb warnings
-ENV DEBIAN_FRONTEND noninteractive
-ENV HOSTNAME picobox
-
-# do install here
-RUN mkdir -p /tmp
-WORKDIR /tmp
-
-# add repository software
-RUN apt-get update
-
-# install nodejs
-# nodejs
-RUN curl -sL https://deb.nodesource.com/setup_6.x | bash -
-RUN apt-get install -y nodejs
-
-# utils
-RUN apt-get install -y nano git build-essential
-
-# make nano work
-RUN echo "export TERM=xterm" >> /etc/bash.bashrc
-
-# get inotify
-RUN apt-get install -y inotify-tools
-
-# update mix
-RUN mix local.hex --force
-RUN mix local.rebar --force
-
-# phoenix
-RUN mix archive.install --force https://github.com/phoenixframework/archives/raw/master/phx_new.ez
-
-# working dir
-RUN mkdir -p $APP_HOME
-WORKDIR $APP_HOME
-
-# hook up source
-ONBUILD ADD . $APP_HOME

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

@@ -1,26 +0,0 @@
----
-version: '2'
-volumes:
-  db-data:
-    external: false
-services:
-  dev:
-    build: "."
-    entrypoint: ".picobox/start"
-    volumes:
-    - ".:/var/www:cached"
-    hostname: picobox
-    environment:
-      MIX_ENV: dev
-    ports:
-    - 80:4000
-    - 4000:4000
-  test:
-    build: "."
-    entrypoint: ".picobox/start"
-    volumes:
-    - ".:/var/www:cached"
-    environment:
-      MIX_ENV: test
-    hostname: picobox_test
-