picobox 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ed4f8c0e2dec278d5f4cfd6978f567b7ac41c3b
-  data.tar.gz: bc23fbcb13649a2b223d982510a485b0e064ffaa
+  metadata.gz: 39a5b830c2733f29c9d8dbf58508f95fde56aa94
+  data.tar.gz: a2a57a7a8af2c4cdc2bef8e7eaf37c4369ed5574
 SHA512:
-  metadata.gz: fc143f7f5f712ac59aa1afa3b40481208a6c939aad3190940aa30633089057ea898ec86e916ed189af650f74f71ab8d5ca04fe1eabd6c74ce29b51ab4ca1b817
-  data.tar.gz: d1100aede4e1e63558ff2416e9d94433114f73c0f7721a747f68fcc8a11fb7fbd13346ec2d2d3ce55bcbb17c66abdc45bb80dd63560c0173d7c4ce8f2cc29a47
+  metadata.gz: 97e2e58e6d8288484f8a0e68deedfcf1a154a71d13fddc91c45c0c5708b4351c4872bf025c2261bc786773dec8bcc6d41d0ccd78e25e405a516f775f684fac91
+  data.tar.gz: 3e3543cb2354086dd24d4715b7b3a2e23483eb5afbed0c764b0cf58a289e29b635d9035bb56c2a93a15dcca02d891967a3f490276ed6827381db224098d5a549

data/lib/picobox/commands/start.rb

@@ -6,7 +6,7 @@ module Picobox
 
         raise Errors::ProjectNotInitialized unless project_initialized?
 
-        system("docker-compose up -d #{Picobox.output}") unless project_running?
+        system("docker-compose up -d #{Picobox.output}")
         publish_event :started
       end
 
@@ -17,7 +17,6 @@ module Picobox
 
       private
       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/stop.rb

@@ -6,8 +6,7 @@ module Picobox
 
         raise Errors::ProjectNotInitialized unless project_initialized?
 
-        system("docker-compose down #{Picobox.output}") if project_running?
-
+        system("docker-compose down #{Picobox.output}")
 
         publish_event :stopped
       end
@@ -19,7 +18,6 @@ module Picobox
 
       private
       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/constants.rb

@@ -1,6 +1,6 @@
 module Picobox
   # names for files / directories
-  VERSION          = '0.2.5'
+  VERSION          = '0.2.6'
   HOMEPAGE         = 'https://github.com/surzycki/picobox'
   CONFIG_DIR       = '.picobox'
   PROJECT_INI      = 'project.ini'

data/lib/picobox/shell/startup_script.rb

@@ -6,7 +6,7 @@ module Picobox
           case "#{os.user_shell}:#{os.to_s}"
           when '/bin/bash:darwin'
             Shell::DotProfile.new(os)
-          when '/bin/zsh:darwin'
+          when '/bin/zsh:darwin', '/usr/bin/zsh:linux'
             Shell::DotZshRC.new(os)
           when '/bin/bash:linux'
             Shell::DotBashRC.new(os)

data/lib/picobox/templates/shell_extensions.bash

@@ -3,11 +3,7 @@
 # setup picobox proxies
 #
 
-###
-### settings
-###
-DEV="dev"
-TEST="test"
+
 ##
 ## functions
 ##
@@ -31,24 +27,36 @@ can_execute () {
 
 picobox_proxy () {
   if can_execute; then
-    docker-compose exec $1 $2 "${@:3}"
+    docker-compose exec "${@}"
   else
     if [ "$ZSH_NAME" ]; then
-      `whence -p $2` "${@:3}"
+      `whence -p "$2"` "${@:3}"
     else
-      `type -P $2` "${@:3}"
+      `type -P "$2"` "${@:3}"
     fi
   fi
 }
 
+#picobox_cmd() {
+#  case "${@[1]}" in
+#    rails)
+#      cmd=(dev bundle exec rails "${@:2}")
+#      ;;
+#    *)
+#      echo "dunno"
+#  esac
+#
+#  picobox_proxy ${cmd[@]}
+#}
+
 ##
 ## ruby proxies
 ##
-picobox_gem ()    { picobox_proxy $DEV "gem" "$@" ; }
-picobox_rake ()   { picobox_proxy $DEV "rake" "$@" ; }
-picobox_bundle () { picobox_proxy $DEV "bundle" "$@" ; }
-picobox_irb()     { picobox_proxy $DEV "irb" "$@" ;}
-picobox_ruby()    { picobox_proxy $DEV "ruby" "$@" ;}
+picobox_gem ()    { cmd=(dev gem $@) ; picobox_proxy ${cmd[@]} ; }
+picobox_rake ()   { cmd=(dev rake $@) ; picobox_proxy ${cmd[@]} ; }
+picobox_bundle () { cmd=(dev bundle $@) ; picobox_proxy ${cmd[@]} ; }
+picobox_irb()     { cmd=(dev irb $@) ; picobox_proxy ${cmd[@]} ; }
+picobox_ruby()    { cmd=(dev ruby $@) ; picobox_proxy ${cmd[@]} ; }
 
 alias gem=picobox_gem
 alias rake=picobox_rake
@@ -60,14 +68,16 @@ alias ruby=picobox_ruby
 ###
 ## rails proxies
 ##
-picobox_rails ()  { picobox_proxy $DEV "bundle exec rails" "$@" ; }
-picobox_spring () { picobox_proxy $DEV "bundle exec spring" "$@" ; }
-picobox_yarn () { picobox_proxy $DEV "bundle exec yarn" "$@" ; }
-picobox_webpack () { picobox_proxy $DEV "bundle exec webpack" "$@" ; }
-picobox_guard () { picobox_proxy $TEST "bundle exec guard" "$@" ; }
-picobox_rspec () { picobox_proxy $TEST "bundle exec rspec" "$@" ; }
-picobox_webpack_dev_server() { picobox_proxy "webpack" "bundle exec webpack-dev-server" "$@"; }
-picobox_webpack_watcher () { picobox_proxy "webpack" "bundle exec webpack-watcher" "$@" ; }
+picobox_rails ()   { cmd=(dev bundle exec rails $@) ; picobox_proxy ${cmd[@]} ; }
+picobox_spring ()  { cmd=(dev bundle exec spring $@) ; picobox_proxy ${cmd[@]} ; }
+picobox_yarn ()    { cmd=(dev bundle exec yarn $@) ; picobox_proxy ${cmd[@]} ; }
+picobox_webpack () { cmd=(dev bundle exec webpack $@) ; picobox_proxy ${cmd[@]} ; }
+picobox_guard ()   { cmd=(test bundle exec guard $@) ; picobox_proxy ${cmd[@]} ; }
+picobox_rspec ()   { cmd=(test bundle exec rspec $@) ; picobox_proxy ${cmd[@]} ; }
+
+picobox_webpack_dev_server() { cmd=(webpack bundle exec webpack-dev-server $@) ; picobox_proxy ${cmd[@]} ; }
+picobox_webpack_watcher ()   { cmd=(webpack bundle exec webpack-watcher $@) ; picobox_proxy ${cmd[@]} ; }
+
 
 alias rails=picobox_rails
 alias rspec=picobox_rspec
@@ -81,32 +91,32 @@ alias guard=picobox_guard
 ##
 ## redis proxies
 ##
-picobox_redis_cli () { picobox_proxy "redis" "redis-cli" "$@" ; }
+picobox_redis_cli () { cmd=(redis redis-cli $@) ; picobox_proxy ${cmd[@]} ; }
 
 alias redis-cli=picobox_redis_cli
 
 ##
 ## postgres proxies
 ##
-picobox_psql () { picobox_proxy "postgres" "psql" "$@" ; }
+picobox_psql () { cmd=(postgres psql $@) ; picobox_proxy ${cmd[@]} ; }
 
 alias psql=picobox_psql
 
 ##
 ## mysql proxies
 ##
-picobox_mysql () { picobox_proxy "mysql" "mysql" "$@" ; }
+picobox_mysql () { cmd=(mysql mysql $@) ; picobox_proxy ${cmd[@]} ;}
 
-alias psql=picobox_mysql
+alias mysql=picobox_mysql
 
 
 ##
 ## elixir proxies
 ##
-picobox_elixir() { picobox_proxy $DEV "elixir" "$@" ; }
-picobox_mix()    { picobox_proxy $DEV "mix" "$@" ; }
-picobox_iex()    { picobox_proxy $DEV "iex" "$@" ; }
-picobox_erl()    { picobox_proxy $DEV "erl" "$@" ; }
+picobox_elixir() { cmd=(dev elixir $@) ; picobox_proxy ${cmd[@]} ; }
+picobox_mix()    { cmd=(dev mix $@) ; picobox_proxy ${cmd[@]} ; }
+picobox_iex()    { cmd=(dev iex $@) ; picobox_proxy ${cmd[@]} ; }
+picobox_erl()    { cmd=(dev erl $@) ; picobox_proxy ${cmd[@]} ; }
 
 alias elixir=picobox_elixir
 alias mix=picobox_mix
@@ -117,8 +127,8 @@ alias erl=picobox_erl
 ##
 ## python proxies
 ##
-picobox_python() { picobox_proxy $DEV "python" "$@" ; }
-picobox_pip()    { picobox_proxy $DEV "pip" "$@" ; }
+picobox_python() { cmd=(dev python $@) ; picobox_proxy ${cmd[@]} ; }
+picobox_pip()    { cmd=(dev pip $@) ; picobox_proxy ${cmd[@]} ; }
 
 alias python=picobox_python
 alias pip=picobox_pip

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: picobox
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Stefan Surzycki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-19 00:00:00.000000000 Z
+date: 2017-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug