picobox 0.3.2 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4275326b0f3ef581577f457535d3fbfd0a290d19
-  data.tar.gz: d7dca7b8be77278cd771defee9b8b79432dafe7b
+  metadata.gz: ded8cb446fb955057bf0fccbe10101bc727513e4
+  data.tar.gz: aa79bcdb1461b5591d9ed9cc7261096cca0ca213
 SHA512:
-  metadata.gz: ec7eb20215cfdd81cf245df2bf48d7cc75541b7f8c2ec42fcce33daf3cdc2febcc203042fa4543f7bef896898d77005fa1a6da90efc501636ed653c178ce795d
-  data.tar.gz: cff37976027d8507bdcf0ad96a5b4e880af4c7845712f93bf2c2601c07a96ccf4ab6b932a07fbab41d4de8d2a90872907191ca5886bdfbdd4dc376af253f750e
+  metadata.gz: 1d467ece912eaac8bec1dbde2db545d007eee5af20311221dedba388f907839c149a7e52fc170a32b07bfec59fbb6375aeb90d9cec87b24d30404ecaf405c7fe
+  data.tar.gz: 5abd04e59a4a2e0c41d76ca327920d82880c9f232ada5d5633831a90a8e89341d3e871e308a563650e81c39b4a2bc5d84fd944169919cbb227f66b436bbe8bbd

data/README.md

@@ -1,14 +1,14 @@
 # Picobox
 
-Docker development environment for humans.  So thin (1×10−12 m) you can barley feel it.
+Docker development environment for humans.
 
 Don't want to learn a whole -bunch --of -commands_with_flags/just -to run_rails || other_things?
 
 Start picobox and continue with the way you have always done things, except now, isolated inside containers
 
-*Early release, caution, there be dragons...*
 
-## Installation CLI
+## Install CLI
+
 
 ```bash
 $ gem install picobox
@@ -17,14 +17,13 @@ $ picobox install
 
 That's it your done
 
+**Available boxes**
 
-## Uninstall Picobox
-```bash
-$ picobox uninstall
-$ gem uninstall picobox
-```
-
-Now you are really done
+    elixir
+    nodejs
+    python
+    rails
+    ruby
 
 
 ## Usage
@@ -32,14 +31,12 @@ Now you are really done
 ![demo](https://github.com/surzycki/picobox/blob/master/docs/testdrive.gif)
 (may take a sec to load)
 
-**Create box**
+**Create rails box**
 
 ```bash
 $ mkdir -p Code/rails
 $ cd Code/rails
 $ picobox init rails
-$ picobox build
-$ picobox start
 ```
 
 Your box is up and running, use your container-ized rails as you would normally
@@ -53,7 +50,7 @@ $ rake -T
 $ rails s
 ```
 
-**Do more stuff**
+**Install gems, irb, bundler and more**
 ```bash
 $ gem install rails --no-ri --no-rdoc
 $ irb
@@ -63,13 +60,45 @@ $ ruby
 
 Everything is running inside your box transparently !
 
-## Dependencies
 
-### Linux
+## Detailed Usage
+
+```bash
+Commands:
+  picobox boxes               # list of available boxes
+  picobox help [COMMAND]      # Describe available commands or one specific command
+  picobox init [BOX]          # initialize directory for use with picobox
+  picobox install             # installs picobox
+  picobox reset               # reset picobox containers
+  picobox restart             # restart picobox
+  picobox service SUBCOMMAND  # do things with the SERVICES
+  picobox ssh [SERVICE]       # open shell to service
+  picobox start               # start picobox
+  picobox status              # current status of containers
+  picobox stop                # stop picobox
+  picobox uninstall           # removes picobox
+  picobox update              # udpates picobox
+  picobox version             # displays current version
+
+Commands:
+  picobox service add [SERVICE]             # adds a service to your box
+  picobox service build [SERVICE] optional  # builds the picobox
+  picobox service help [COMMAND]            # Describe subcommands or one specific subcommand
+  picobox service list                      # list available services
+  picobox service remove [SERVICE]          # removes a service from your box
+
+Options:
+  [--verbose], [--no-verbose]  # Verbose debugging output
+```
+
+### Dependencies
+**Linux**
+
 * build-essential
 * ruby
 * ruby-dev
 
+
 ## Development
 
 To run the tests you'll need ruby 2.3 since we are using the <<~EOS operator (un-indented multiline strings)
@@ -79,7 +108,7 @@ After checking out the repo, run `bin/setup` to install dependencies. Then, run
 To use without installing, use:
 
 ```bash
-$ bin/picobox version
+$ bin/picobox_dev version
 ```
 
 To run tests:
@@ -98,9 +127,10 @@ $ rake build
 $ gem install pkg/picobox-x.x.x.gem
 ```
 
-## Helpful stuff
+### Helpful stuff
 
 **debug during an aruba test run**
+
 spec/support/aruba.rb
 ```ruby
 require 'byebug/core'
@@ -117,19 +147,15 @@ $ bundle exec byebug -R localhost:8989
 (byebug) last_command_started
 ```
 
-
-
-## TODO
+### TODO
+- [ ] Install runtime dependecies on linux during setup
 - [ ] Documentation (both in code and wiki)
 - [ ] Include aliases specific to the box when unpacking (maybe)
-- [ ] Add more boxes
 - [ ] Add destroy command
-- [ ] Add Habitus API web server to add ssh keys to containers**
+- [ ] Explore Habitus API web server to add ssh keys to containers**
 - [ ] Use traefik.io for dns
 - [ ] Uninstall should stop and remove all instances that are running
-- [ ] 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/

data/lib/picobox/box.rb

@@ -15,22 +15,16 @@ module Picobox
     rescue Errors::BoxNotImplemented
       display_box_not_available type
       list # called like for exception handling
-    rescue Errors::ProjectNotInitialized
-      display_project_not_initialized
-      exit 1
     rescue StandardError => e
-      display_info(e, :red)
+      display_error e
       exit 1
     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)
+      display_error e
       exit 1
     end
   end

data/lib/picobox/cli.rb

@@ -77,7 +77,6 @@ module Picobox
     def version
       say "Picobox:  #{Picobox::VERSION}"
       say "Packages: #{Picobox::Utils::Packages.new(Os::CurrentOs.get).installed_version[1..-1]}"
-
     rescue SignalException
       exit 1
     end
@@ -88,7 +87,6 @@ module Picobox
     LONGDESC
     def install
       Picobox.set_verbosity options[:verbose]
-
       System.new(Os::CurrentOs.get).install
     rescue SignalException
       exit 1
@@ -100,7 +98,6 @@ module Picobox
     LONGDESC
     def update
       Picobox.set_verbosity options[:verbose]
-
       System.new(Os::CurrentOs.get).install
     rescue SignalException
       exit 1
@@ -112,7 +109,6 @@ module Picobox
     LONGDESC
     def uninstall
       Picobox.set_verbosity options[:verbose]
-
       System.new(Os::CurrentOs.get).uninstall
     rescue SignalException
       exit 1
@@ -141,7 +137,6 @@ module Picobox
     LONGDESC
     def start()
       Picobox.set_verbosity options[:verbose]
-
       System.new(Os::CurrentOs.get).start
     rescue SignalException
       exit 1
@@ -153,7 +148,6 @@ module Picobox
     LONGDESC
     def stop()
       Picobox.set_verbosity options[:verbose]
-
       System.new(Os::CurrentOs.get).stop
     rescue SignalException
       exit 1
@@ -165,7 +159,6 @@ module Picobox
     LONGDESC
     def restart()
       Picobox.set_verbosity options[:verbose]
-
       System.new(Os::CurrentOs.get).restart
     rescue SignalException
       exit 1

data/lib/picobox/commands/start.rb

@@ -6,7 +6,8 @@ module Picobox
 
         raise Errors::ProjectNotInitialized unless os.project_initialized?
 
-        system("docker-compose up -d #{Picobox.output}")
+        system("docker-compose up -d #{Picobox.output}") or raise Errors::DockerError
+
         publish_event :started
       end
 

data/lib/picobox/commands/stop.rb

@@ -6,7 +6,7 @@ module Picobox
 
         raise Errors::ProjectNotInitialized unless os.project_initialized?
 
-        system("docker-compose down #{Picobox.output}")
+        system("docker-compose down #{Picobox.output}") or raise Errors::DockerError
 
         publish_event :stopped
       end

data/lib/picobox/commands/update_packages.rb

@@ -11,9 +11,9 @@ module Picobox
 
           filename = packages.download
 
-          system("sudo rm -rf #{Picobox.packages_dir}")
-          system("sudo mkdir  #{Picobox.packages_dir}")
-          system("sudo tar xvf #{filename} -C #{Picobox.packages_dir} --strip-components=1 #{Picobox.output}")
+          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.current_version, last_update: Time.now.to_i }
 
@@ -23,7 +23,23 @@ module Picobox
 
 
       def visit_linux subject
-        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("sudo rm -rf #{Picobox.packages_dir}")
+          system("sudo mkdir  #{Picobox.packages_dir}")
+          system("sudo tar xvf #{filename} -C #{Picobox.packages_dir} --strip-components=1 #{Picobox.output}")
+
+          Shell::IniFile.get(os)[:packages] = { version: packages.current_version, last_update: Time.now.to_i }
+
+          publish_event :update_packages_stop
+        end
       end
     end
   end

data/lib/picobox/constants.rb

@@ -1,6 +1,6 @@
 module Picobox
   # names for files / directories
-  VERSION           = '0.3.2'
+  VERSION           = '0.3.4'
   HOMEPAGE          = 'https://github.com/surzycki/picobox'
   PACKAGES_INFO_URL = 'https://api.github.com/repos/picobox/packages/releases/latest'
   CONFIG_DIR        = '.picobox'

data/lib/picobox/errors/picobox_error.rb

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

data/lib/picobox/project.rb

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

data/lib/picobox/service.rb

@@ -12,24 +12,15 @@ module Picobox
     def build(service=nil)
       accept(Commands::BuildService.new(service))
     rescue StandardError => e
-      display_info(e, :red)
+      display_error e
       exit 1
     end
 
     def add(services)
       services.each { |service| accept(Commands::AddService.new(service)) }
       accept(Commands::Restart.new)
-    rescue Errors::ServiceNotImplemented => e
-      display_service_not_available e.message
-      exit 1
-    rescue Errors::ProjectNotInitialized
-      display_project_not_initialized
-      exit 1
-    rescue Picobox::Errors::FileNotFoundError => e
-      display_file_not_found e.message
-      exit 1
     rescue StandardError => e
-      display_info(e, :red)
+      display_error e
       exit 1
     end
 
@@ -42,14 +33,8 @@ module Picobox
       display_service_not_installed type
     rescue Errors::ServiceNotImplemented
       display_service_not_available type
-    rescue Errors::ProjectNotInitialized
-      display_project_not_initialized
-      exit 1
-    rescue Picobox::Errors::FileNotFoundError => e
-      display_file_not_found e.message
-      exit
     rescue StandardError => e
-      display_info(e, :red)
+      display_error e
       exit 1
     end
 
@@ -57,11 +42,8 @@ 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)
+      display_error e
       exit 1
     end
   end

data/lib/picobox/shell/startup_script.rb

@@ -4,11 +4,11 @@ module Picobox
       class << self
         def get(os)
           case "#{os.user_shell}:#{os.to_s}"
-          when '/bin/bash:darwin'
+          when /\/bin\/bash:darwin/
             Shell::DotProfile.new(os)
-          when '/bin/zsh:darwin', '/usr/bin/zsh:linux'
+          when /\/bin\/zsh:darwin/, /\/bin\/zsh:linux/
             Shell::DotZshRC.new(os)
-          when '/bin/bash:linux'
+          when /\/bin\/bash:linux/
             Shell::DotBashRC.new(os)
           else
             raise Errors::ShellNotSupported, "#{os.user_shell}:#{os.to_s}"

data/lib/picobox/system.rb

@@ -19,14 +19,8 @@ module Picobox
       accept(Commands::SetupShell.new)
       accept(Commands::FinishInstall.new)
       accept(Commands::ReloadShell.new)
-    rescue Errors::ShellNotSupported => e
-      display_shell_not_supported e.message
-      exit 1
-    rescue Errors::DistroNotSupported => e
-      display_distro_not_supported
-      exit 1
     rescue StandardError => e
-      display_info(e, :red)
+      display_error e
       exit 1
     end
 
@@ -35,58 +29,40 @@ module Picobox
       accept(Commands::StartUninstall.new)
       accept(Commands::RemoveSetupShell.new)
       accept(Commands::FinishUninstall.new)
-    rescue Errors::PicoboxNotInstalled
-      display_picobox_not_installed
-      exit 1
     rescue StandardError => e
-      display_info(e, :red)
+      display_error e
       exit 1
     end
 
 
     def start
       accept(Commands::Start.new)
-    rescue Errors::ProjectNotInitialized
-      display_project_not_initialized
-      exit 1
     rescue StandardError => e
-      display_info(e, :red)
+      display_error e
       exit 1
     end
 
 
     def stop
       accept(Commands::Stop.new)
-    rescue Errors::ProjectNotInitialized
-      display_project_not_initialized
-      exit 1
     rescue StandardError => e
-      display_info(e, :red)
+      display_error e
       exit 1
     end
 
 
     def restart
       accept(Commands::Restart.new)
-    rescue Errors::ProjectNotInitialized
-      display_project_not_initialized
-      exit 1
     rescue StandardError => e
-      display_info(e, :red)
+      display_error e
       exit 1
     end
 
 
     def ssh(service)
       accept(Commands::SshInstance.new(service))
-    rescue Errors::SystemDownError
-      display_system_down
-      exit 1
-    rescue Errors::ProjectNotInitialized
-      display_project_not_initialized
-      exit 1
     rescue StandardError => e
-      display_info(e, :red)
+      display_error e
       exit 1
     end
   end

data/lib/picobox/utils/output.rb

@@ -17,6 +17,30 @@ module Picobox
       end
 
 
+      def display_error(e)
+        case e
+        when Errors::ProjectNotInitialized
+          display_project_not_initialized
+        when Errors::DockerError
+          display_docker_error
+        when Errors::SystemDownError
+          display_system_down
+        when Errors::ShellNotSupported
+          display_shell_not_supported e.message
+        when Errors::DistroNotSupported
+          display_distro_not_supported
+        when Errors::PicoboxNotInstalled
+          display_picobox_not_installed
+        when Errors::ServiceNotImplemented
+          display_service_not_available e.message
+        when Picobox::Errors::FileNotFoundError
+          display_file_not_found e.message
+        else
+          display_info(e, :red)
+        end
+      end
+
+      private
       def display_project_not_initialized
         display_status('error', 'no project found', :red)
         display_info("Run 'picobox init [BOX]'", :yellow)
@@ -66,6 +90,12 @@ module Picobox
         display_info('distro is not yet supported :(', :red)
       end
 
+      def display_docker_error
+        display_info "Docker gave an error", :red
+        display_info "Check to see if docker is running", :red
+        display_info("Try running 'docker ps'", :yellow)
+      end
+
       private
       def thor
         @thor ||= Thor::Shell::Color.new

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: picobox
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.4
 platform: ruby
 authors:
 - Stefan Surzycki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-02 00:00:00.000000000 Z
+date: 2017-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug