charmkit 0.4.8 → 0.4.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4487ffdd9f42177d0b98dbe8ade34b2fd7feb3e2
-  data.tar.gz: 682d10d0feef7c241d4f8cb94a3e7aceaed8d121
+  metadata.gz: d1ed1d1b33b056348463ac9f861a8d64d0f58a9c
+  data.tar.gz: 0afb41943b5aec098e1b0798b01d9f5d37f7296d
 SHA512:
-  metadata.gz: 87a387953fc9b7e44802e801a445eb9675cdbe20facb81343c5bc3fd929834603158153a8fb123f92b7943ab06c4a1b67b6cd515d4ad4011db84de8c85da7201
-  data.tar.gz: feed85b1ece91c509177b6802e5fd3d94ba2eeae099e5ba0fe85ca651b6208805b5498b59b2efc0d178aa2df726666b3c5e612903bfb0c08c82a961836224671
+  metadata.gz: d0fa005597463a6d1cca7bfea6b91d6ef35372dfbcc1d7ec9dbae66ea52a3e4fe20438973e34d538c75c1427d8baab97f16bb9c81e116665dad44bb9670fe6c0
+  data.tar.gz: 072010d8fc17dd186b62b42c4a90db4422ea61b96939782db674af0226bcd80d83bebb04e5730c6103efe96b0cd49a5b1ee0264475d541b73551cdb354e488fc

data/charmkit.gemspec

@@ -22,6 +22,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "tty-command"
+  spec.add_dependency "activesupport"
+  spec.add_dependency "thor"
 
   spec.add_development_dependency "bundler", "~> 1.13"
   spec.add_development_dependency "rake", "~> 10.0"

data/examples/my-demo-charm/Rakefile

@@ -7,32 +7,33 @@ require 'charmkit/plugins/php'
 # The below require_relative will load a local task from tasks/vim.rb
 require_relative "tasks/vim.rb"
 
+
+
+app_path = path(config('app_path'))
+
 namespace :dokuwiki do
 
   desc "Install Dokuwiki"
   # Notice that I set task dependencies on nginx, php, AND vim
   # so that they get installed prior to installing dokuwiki
   task :install => ["nginx:install", "php:install", "vim:install"] do
-    app_path = `config-get app_path`.chomp
     resource_path = `resource-get stable-release`.chomp
-    hook_path = ENV['JUJU_CHARM_DIR']
 
-    mkdir_p app_path unless Dir.exists? app_path
+    mkdir_p app_path unless app_path.directory?
+
+    run "tar", "xf", resource_path, "-C", app_path, "--strip-components=1"
 
-    `tar xf #{resource_path} -C #{app_path} --strip-components=1`
     cp "#{hook_path}/templates/acl.auth.php", "#{app_path}/conf/acl.auth.php"
     cp "#{hook_path}/templates/local.php", "#{app_path}/conf/local.php"
     cp "#{hook_path}/templates/plugins.local.php", "#{app_path}/conf/plugin.local.php"
 
     version = File.read "#{app_path}/VERSION"
-    `application-version-set '#{version}'`
-    `status-set active "Dokuwiki Install finished."`
+    run "application-version-set", version.chomp
+    run "status-set", "active", "Dokuwiki Install finished."
   end
 
   desc "Configure Dokuwiki"
   task :config_changed do
-    app_path = `config-get app_path`.chomp
-    hook_path = ENV['JUJU_CHARM_DIR']
 
     admin_user = `config-get admin_user`.chomp
     admin_password = `config-get admin_password`.chomp

data/lib/charmkit/helpers/fs.rb

@@ -1,5 +1,12 @@
+require 'pathname'
+
 module Charmkit
   module Helpers
+    # sugar over pathname
+    def path(pn)
+      Pathname.new(pn)
+    end
+
     # Create a file with data
     #
     # @param dst String

data/lib/charmkit/helpers/hookenv.rb

@@ -1,5 +1,12 @@
 module Charmkit
   module Helpers
+    # Hook path within a charm execution
+    #
+    # @return [String]
+    def hook_path
+      ENV['JUJU_CHARM_DIR']
+    end
+
     def status(level=:maintenance, msg="")
       levels = [:maintenance, :active, :blocked, :waiting]
       raise unless levels.include?(level)

data/lib/charmkit/helpers/runner.rb

@@ -2,8 +2,15 @@ require 'tty-command'
 
 module Charmkit
   module Helpers
+    extend Forwardable
+    def_delegators :cmd, :run, :run!, :test
+
     def cmd
-      return TTY::Command.new
+      if ENV['DRYRUN']
+        TTY::Command.new(dryrun: true)
+      else
+        TTY::Command.new
+      end
     end
   end
 end

data/lib/charmkit/version.rb

@@ -6,7 +6,7 @@ module Charmkit
   module VERSION
     MAJOR = 0
     MINOR = 4
-    PATCH = 8
+    PATCH = 9
     PRE = nil
 
     STRING = [MAJOR, MINOR, PATCH, PRE].compact.join('.')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: charmkit
 version: !ruby/object:Gem::Version
-  version: 0.4.8
+  version: 0.4.9
 platform: ruby
 authors:
 - Adam Stokes
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-12 00:00:00.000000000 Z
+date: 2016-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tty-command
@@ -24,6 +24,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  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
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement