karo 2.3.7 → 2.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 368231ebc105f20e2014dbf8488c698b5b2503b0
-  data.tar.gz: cdff0022408ee2d4292ba7e5b0c535aa7700d544
+  metadata.gz: 4af1678ba8d7e513d711d893c9036139fbb85ae9
+  data.tar.gz: e5695accff3d137118c7c0ec3293622dad51bb90
 SHA512:
-  metadata.gz: 4938739b61e6287d56d3da3c0152c41061297229c6db9e32e2ecc18003e5cdce21f0517c8fc367685929e5a29cc4cfe9f3674946412b10284b9ef120ba9f3922
-  data.tar.gz: ac1ccc32bbe862df547f1262aac1313e6d952df89853f82c8be5e73a547e8c24a4931d2cc653b64357006dd4a6aac8b3ff441b45db137f46924550ae30ec3379
+  metadata.gz: b8f59fa373c299500c1ca622ccaeb7c4fe065e4f675ab6a746ebd5bc9197622c9a44f0d41fe2d04ba56e70cedbbeaf15cca690422b0604b324b8a442fb92e41e
+  data.tar.gz: 5e981778688c936dc3da4d6f71a7738055c1b8eeac5a7004f80a91675e116ab52a6ca3316e828f3db726fdf2dff53c86d7ab1ed57846e9b9a1d367a9ca97beb2

data/CHANGELOG.md

@@ -4,6 +4,13 @@
 
 ### Features
 
+- Added support for custom assets path
+- Added support doing a dry-run on any command with --dryrun or -d option
+
+## v2.3.7
+
+### Features
+
 - Added support for pulling postgres databases
 
 ## v2.3.6

data/lib/karo/assets.rb

@@ -8,13 +8,33 @@ module Karo
     include Karo::Common
 
 	  desc "pull", "syncs assets from server shared/system/dragonfly/<environment> directory into local system/dragonfly/development directory"
+    long_desc <<-LONGDESC
+    You can also change assets server and local path for a given environment in the configuration file
+
+    e.g. .karo.yml
+
+    production:
+
+    --assets:
+
+    ----server: /data/app/shared/assets
+
+    ----local: shared/assets
+    LONGDESC
 	  def pull
 	    configuration = Config.load_configuration(options)
 
-      path_local  = File.expand_path("public/system/dragonfly/development")
-      empty_directory path_local unless File.exists?(path_local)
+      assets   = configuration["assets"]
+      assets ||= {}
+
+      path_local   = assets["local"]
+      path_local ||= "public/system/dragonfly/development"
+      path_local   = File.expand_path(path_local)
+
+      empty_directory path_local if !File.exists?(path_local) && !options[:dryrun]
 
-      path_server = File.join(configuration["path"], "shared/system/dragonfly/#{options[:environment]}")
+      path_server   = assets["server"]
+      path_server ||= File.join(configuration["path"], "shared/system/dragonfly/#{options[:environment]}")
 
 	    host = "#{configuration["user"]}@#{configuration["host"]}"
 	    command  = "rsync -az --progress #{host}:#{path_server}/ #{path_local}/"
@@ -25,17 +45,37 @@ module Karo
 	  end
 
     desc "push", "syncs assets from system/dragonfly/development directory into local server shared/system/dragonfly/<environment> directory"
+    long_desc <<-LONGDESC
+    You can also change assets server and local path for a given environment in the configuration file
+
+    e.g. .karo.yml
+
+    production:
+
+    --assets:
+
+    ----server: /data/app/shared/assets
+
+    ----local: shared/assets
+    LONGDESC
 	  def push
       configuration = Config.load_configuration(options)
 
-      path_local  = File.expand_path("public/system/dragonfly/development")
+      assets   = configuration["assets"]
+      assets ||= {}
+
+      path_local   = assets["local"]
+      path_local ||= "public/system/dragonfly/development"
+      path_local   = File.expand_path(path_local)
+
       unless File.exists?(path_local)
         raise Thor::Error, "Please make sure that this local path exists? '#{path_local}'"
       end
 
       host = "#{configuration["user"]}@#{configuration["host"]}"
 
-      path_server = File.join(configuration["path"], "shared/system/dragonfly/#{options[:environment]}")
+      path_server   = assets["server"]
+      path_server ||= File.join(configuration["path"], "shared/system/dragonfly/#{options[:environment]}")
 
       command_1  = "ssh #{host} 'mkdir -p #{path_server}'"
       command_2  = "rsync -az --progress #{path_local}/ #{host}:#{path_server}/"

data/lib/karo/cli.rb

@@ -19,6 +19,7 @@ module Karo
                   aliases: "-c", desc: "name of the file containing server configuration"
     class_option :environment, aliases: "-e", desc: "server environment", default: "production"
     class_option :verbose, type: :boolean, lazy_default: true, aliases: "-v", desc: "verbose"
+    class_option :dryrun,  type: :boolean, lazy_default: true, aliases: "-d", desc: "dry-run"
 
     desc "cache [search, remove]", "find or clears a specific or all cache from shared/cache directory on the server"
     subcommand "cache", Cache

data/lib/karo/common.rb

@@ -21,7 +21,7 @@ module Karo
 
     def run_it(cmd, verbose=false)
       say cmd, :green if verbose
-      system cmd
+      system cmd unless options[:dryrun]
     end
 
     def git_repo

data/lib/karo/templates/karo.yml

@@ -2,6 +2,7 @@ production:
   host: example.com
   user: deploy
   path: /data/app_name
+  assets_path: /data/app_name/shared/system/dragonfly/production
   commands:
     server:
       memory: watch vmstat -sSM

data/lib/karo/version.rb

@@ -1,3 +1,3 @@
 module Karo
-  VERSION = "2.3.7"
+  VERSION = "2.3.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: karo
 version: !ruby/object:Gem::Version
-  version: 2.3.7
+  version: 2.3.8
 platform: ruby
 authors:
 - Rahul Trikha
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-10 00:00:00.000000000 Z
+date: 2014-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry