picobox 0.1.7 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a1a3a9947689e3daf1a03f70fd432574bfdca2f5
-  data.tar.gz: f5be560ca0068a18d499943217c9e5b68fbb6231
+  metadata.gz: 649bcb114c8fd7298d2791313377d7700853d080
+  data.tar.gz: f897fc645ff84b0377012c11bb86eece25e04d68
 SHA512:
-  metadata.gz: abab2a2f849dc170d15c9363df8d6eb38438e10b966bccff92eebce6181b0802536c60be7d0b89b0c72bdec2124b8d5e1e4a9c20f3b9e953b0a9996ee2990ec0
-  data.tar.gz: 469985d45128f82114a3f22c0d5420efb83a4d795ac34832c2cdf51fed1eec0c5f053e59eea6c8f424ea264b125bd7fb7099064fef3dbb6ce60b54766a7d2fdf
+  metadata.gz: 4b215666290df4a457c543a9dfc4bc8efa8db2392669ca1953109dbeba0b257a0a36b1124ca13e35e67a210337bbd71ce1805c6412952cf48af41c21eed7cf9a
+  data.tar.gz: 87a78effe3224a45a9a4eb968090ae95cfe379dd0a602e16570545ce21b5e9c1d592ae71683a6e7c5889b0d4511e02bf80a5024c98c1b330f270c29f3013d442

data/.gitignore

@@ -7,7 +7,7 @@
 /pkg/
 /spec/reports/
 /tmp/
-
+/vendor/bundle
 .picobox
 .byebug_history
 .DS_Store

data/README.md

@@ -123,7 +123,7 @@ $ bundle exec byebug -R localhost:8989
 - [ ] 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 funtion
+- [ ] Box update function
 
 **http://blog.cloud66.com/using-ssh-private-keys-securely-in-docker-build/
 

data/lib/picobox.rb

@@ -6,12 +6,15 @@ require 'uri'
 require 'tty-file'
 require 'tty-command'
 require 'tty-platform'
+require 'tty-which'
+require 'tty-spinner'
 require 'ostruct'
 require 'yaml'
 require 'inifile'
 require 'pathname'
 
 require 'picobox/utils/progress_bar'
+require 'picobox/utils/spinner'
 require 'picobox/utils/project'
 require 'picobox/utils/visitable'
 require 'picobox/utils/domain_event_publisher'
@@ -43,7 +46,9 @@ require 'picobox/commands/remove_service'
 require 'picobox/commands/start'
 require 'picobox/commands/stop'
 require 'picobox/commands/restart'
-require 'picobox/commands/open_shell'
+require 'picobox/commands/ssh_instance'
+require 'picobox/commands/reload_shell'
+require 'picobox/commands/get_root_permission'
 
 require 'picobox/boxes/manifest'
 require 'picobox/boxes/unpacker'
@@ -56,10 +61,12 @@ require 'picobox/os/darwin'
 require 'picobox/os/linux'
 require 'picobox/os/unsupported_os'
 require 'picobox/os/current_os'
+require 'picobox/os/distro'
 
 require 'picobox/shell/startup_script'
 require 'picobox/shell/dot_profile'
 require 'picobox/shell/dot_zshrc'
+require 'picobox/shell/dot_bashrc'
 
 require 'picobox/constants'
 require 'picobox/cli'
@@ -73,7 +80,5 @@ Wisper.subscribe(
   scope: Picobox::Utils::DomainEventPublisher
 )
 
-# silence warnings found in tty-file-0.3.0 for forwarding to private method
-$VERBOSE=nil
-
+Picobox.set_verbosity(false)
 

data/lib/picobox/box.rb

@@ -22,14 +22,14 @@ module Picobox
     rescue Errors::ProjectNotInitialized
       display_project_not_initialized
       exit 1
-    rescue Exception => e
+    rescue StandardError => e
       display_info(e, :red)
       exit 1
     end
 
     def list()
       accept(Commands::ListBoxes.new)
-    rescue Exception => e
+    rescue StandardError => e
       display_info(e, :red)
       exit 1
     end

data/lib/picobox/boxes/manifest.rb

@@ -7,7 +7,7 @@ module Picobox
 
       def list
         result = Dir.glob("#{Picobox.box_packages_dir}/*").select {|f| File.directory? f}
-        result.map {|r| strip_path(r) }
+        result.map {|r| strip_path(r) }.sort!
       end
 
 

data/lib/picobox/cli.rb

@@ -4,7 +4,11 @@ module Picobox
     long_desc <<-LONGDESC
     LONGDESC
     def build(service = nil)
+      Picobox.set_verbosity options[:verbose]
+
       Service.new(Os::CurrentOs.get).build service
+    rescue SignalException
+      exit 1
     end
 
 
@@ -12,7 +16,11 @@ module Picobox
     long_desc <<-LONGDESC
     LONGDESC
     def add(*services)
+      Picobox.set_verbosity options[:verbose]
+
       Service.new(Os::CurrentOs.get).add services
+    rescue SignalException
+      exit 1
     end
 
 
@@ -20,7 +28,11 @@ module Picobox
     long_desc <<-LONGDESC
     LONGDESC
     def remove(service)
+      Picobox.set_verbosity options[:verbose]
+      
       Service.new(Os::CurrentOs.get).remove service
+    rescue SignalException
+      exit 1
     end
 
 
@@ -29,6 +41,8 @@ module Picobox
     LONGDESC
     def list()
       Service.new(Os::CurrentOs.get).list
+    rescue SignalException
+      exit 1
     end
   end
 
@@ -38,17 +52,19 @@ module Picobox
     LONGDESC
     method_option :port, default: 3000
     def add(entry)
-      puts "I'm a thor task! #{options}"
+      puts "coming soon"
     end
   end
 
   class CLI < Thor
     include Utils::Output
 
-    desc 'dns SUBCOMMAND', 'do things with the DNS'
-    long_desc <<-LONGDESC
-    LONGDESC
-    subcommand 'dns', Picobox::DnsSubCommands
+    class_option :verbose, desc: 'Verbose debugging output', type: :boolean
+
+    #desc 'dns SUBCOMMAND', 'do things with the DNS'
+    #long_desc <<-LONGDESC
+    #LONGDESC
+    #subcommand 'dns', Picobox::DnsSubCommands
 
 
     desc 'service SUBCOMMAND', 'do things with the SERVICES'
@@ -60,6 +76,8 @@ module Picobox
     desc 'version', 'displays current version'
     def version
       say Picobox::VERSION
+    rescue SignalException
+      exit 1
     end
 
 
@@ -67,8 +85,11 @@ module Picobox
     long_desc <<-LONGDESC
     LONGDESC
     def install
+      Picobox.set_verbosity options[:verbose]
+
       System.new(Os::CurrentOs.get).install
-      Utils::Shell.new(Os::CurrentOs.get).reload
+    rescue SignalException
+      exit 1
     end
 
 
@@ -76,8 +97,11 @@ module Picobox
     long_desc <<-LONGDESC
     LONGDESC
     def update
+      Picobox.set_verbosity options[:verbose]
+
       System.new(Os::CurrentOs.get).install
-      Utils::Shell.new(Os::CurrentOs.get).reload
+    rescue SignalException
+      exit 1
     end
 
 
@@ -85,7 +109,11 @@ module Picobox
     long_desc <<-LONGDESC
     LONGDESC
     def uninstall
+      Picobox.set_verbosity options[:verbose]
+
       System.new(Os::CurrentOs.get).uninstall
+    rescue SignalException
+      exit 1
     end
 
 
@@ -93,12 +121,16 @@ module Picobox
     long_desc <<-LONGDESC
     LONGDESC
     def init(box)
+      Picobox.set_verbosity options[:verbose]
+
       os = Os::CurrentOs.get
 
       Project.new(os).init
       Box.new(os).install box
       Service.new(os).build
       System.new(os).start
+    rescue SignalException
+      exit 1
     end
 
 
@@ -106,7 +138,11 @@ module Picobox
     long_desc <<-LONGDESC
     LONGDESC
     def start()
+      Picobox.set_verbosity options[:verbose]
+
       System.new(Os::CurrentOs.get).start
+    rescue SignalException
+      exit 1
     end
 
 
@@ -114,7 +150,11 @@ module Picobox
     long_desc <<-LONGDESC
     LONGDESC
     def stop()
+      Picobox.set_verbosity options[:verbose]
+
       System.new(Os::CurrentOs.get).stop
+    rescue SignalException
+      exit 1
     end
 
 
@@ -122,7 +162,11 @@ module Picobox
     long_desc <<-LONGDESC
     LONGDESC
     def restart()
+      Picobox.set_verbosity options[:verbose]
+
       System.new(Os::CurrentOs.get).restart
+    rescue SignalException
+      exit 1
     end
 
 
@@ -130,7 +174,9 @@ module Picobox
     long_desc <<-LONGDESC
     LONGDESC
     def ssh(service)
-      System.new(Os::CurrentOs.get).open_shell service
+      System.new(Os::CurrentOs.get).ssh service
+    rescue SignalException
+      exit 1
     end
 
 
@@ -139,6 +185,8 @@ module Picobox
     LONGDESC
     def boxes()
       Box.new(Os::CurrentOs.get).list
+    rescue SignalException
+      exit 1
     end
 
 
@@ -147,17 +195,21 @@ module Picobox
     LONGDESC
     def status()
       system "docker-compose ps"
+    rescue SignalException
+      exit 1
     end
 
 
-    desc 'clean', 'clean stop containers'
+    desc 'reset', 'reset picobox containers'
     long_desc <<-LONGDESC
     LONGDESC
-    def clean()
+    def reset()
       display_info('Cleaning stopped containers', :green)
       display_status('execute', 'container prune')
       system "docker container prune"
       system "docker volume prune"
+    rescue SignalException
+      exit 1
     end
   end
 end

data/lib/picobox/commands/add_box.rb

@@ -6,7 +6,6 @@ module Picobox
       end
 
       def visit_darwin subject
-        @os = subject.os
         publish_event :add_box_start, type
 
         raise Errors::ProjectNotInitialized unless project_initialized?
@@ -14,8 +13,13 @@ module Picobox
         Boxes::Unpacker.new(os).unpack(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/add_service.rb

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

data/lib/picobox/commands/build_service.rb

@@ -6,7 +6,14 @@ module Picobox
       end
 
       def visit_darwin subject
-        system "docker-compose build #{service}"
+        publish_event :build_service_start, service
+        system "docker-compose build #{service} #{Picobox.output}"
+        publish_event :build_service_stop 
+      end
+
+
+      def visit_linux subject
+        visit_darwin subject
       end
 
       private

data/lib/picobox/commands/download_docker.rb

@@ -1,17 +1,35 @@
 module Picobox
   module Commands
     class DownloadDocker < Picobox::Utils::VisitorByOs
-      def visit_darwin subject
-        unless subject.os.docker_installed?
-          stream = open(subject.os.docker_url,
+      def visit_darwin subject 
+        unless os.docker_installed?
+          stream = open(os.docker_url,
             content_length_proc: lambda { |total| publish_event :download_docker_start, total },
-            progress_proc: lambda { |step| publish_event :download_docker_progress, step }
+            progress_proc: lambda { |step| publish_event :download_progress, step }
           )
 
-          IO.copy_stream( stream, subject.os.docker_installer )
+          IO.copy_stream( stream, os.docker_installer )
           publish_event :download_docker_complete
         end
       end
+
+
+      def visit_linux subject 
+        unless os.docker_compose_installed?
+          stream = open(os.docker_compose_url,
+            content_length_proc: lambda { |total| publish_event :download_docker_compose_start, total },
+            progress_proc: lambda { |step| publish_event :download_progress, step }
+          )
+
+          IO.copy_stream( stream, "#{os.tmp_dir}/docker_compose" )
+          publish_event :download_docker_compose_complete
+
+          system("#{os.su} 'mv #{os.tmp_dir}/docker_compose #{os.docker_compose}'")
+          TTY::File.chmod(os.docker_compose, 'u=x')
+        else
+          publish_event :docker_present, os.docker_compose_version?
+        end
+      end  
     end
   end
 end

data/lib/picobox/commands/finish_install.rb

@@ -2,9 +2,15 @@ module Picobox
   module Commands
     class FinishInstall < Picobox::Utils::VisitorByOs
       def visit_darwin subject
+        publish_event :add_post_install_message, 'You should reload open shells to pick up shell changes'
         publish_event :install_complete
         publish_event :post_install_messages
       end
+
+
+      def visit_linux subject
+        visit_darwin subject
+      end
     end
   end
 end

data/lib/picobox/commands/finish_uninstall.rb

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