charmkit 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2694aa3234aab42395939a61724fc04942537a1d
-  data.tar.gz: fe4b8c831f4cd517ebcea769bcfba5b91cab76a5
+  metadata.gz: 4c61b8a5df2d9fa456312355f5c1a6fbb5eac127
+  data.tar.gz: b8922c3548a51783da295fb921a45ba285237a34
 SHA512:
-  metadata.gz: d02d16fe85ba47ae73281830c965eaec5e843bb0046fc03d58a616dc26311b5fc10cf0e73d480ccac2631f83d413ba8ac8262964cbd18aa26d2d73d1bd8e8efd
-  data.tar.gz: 49d61068e00a397c3bf436419ca7880289fa499aa124794ba49eddc1531cabef2a15951e73f320147a4ae692eb13fe91543b69fc6e8363d53ae45204cd2e7585
+  metadata.gz: 025622d786353958686dad9735b8841b927f0dd26b6c636d5ce5148a378e0a1100095414c96f28f3174129ae52cdd865024833bf5b46fa4fa65a0e2adf139a16
+  data.tar.gz: 64a98f72f23f8274df138242e3060da5e9d40704fc0f0ddb3b574b4292a0d1f9ee239e6f7ef375092287f371e058ac46c9e5903dbeaacba608d8169be6b118b0

data/examples/render_inline.rb

@@ -0,0 +1,59 @@
+require 'charmkit'
+
+template('examples/my-demo-charm/templates/vhost.conf',
+         '/tmp/nginx-data.conf',
+         public_address: 'localhost',
+         app_path: '/srv/app')
+
+inline_template('vhost.conf',
+                '/tmp/output.txt',
+                public_address: "localhost",
+                app_path: "/srv/app")
+__END__
+
+@@ nginx.conf
+
+server_connections { 50m; }
+
+@@ vhost.conf
+
+server {
+        ## Your website name goes here.
+        server_name <%= public_address %>;
+        ## Your only path reference.
+        root <%= app_path %>;
+        location / {
+		index doku.php;
+                # This is cool because no php is touched for static content.
+                # include the "?$args" part so non-default permalinks doesn't break when using query string
+                try_files $uri $uri/ @dokuwiki;
+        }
+
+	location ~ ^/lib.*\.(gif|png|ico|jpg)$ {
+                    expires 30d;
+	}
+
+	location ^~ /conf/ { return 403; }
+	location ^~ /data/ { return 403; }
+
+ 	location @dokuwiki {
+		rewrite ^/_media/(.*) /lib/exe/fetch.php?media=$1 last;
+		rewrite ^/_detail/(.*) /lib/exe/detail.php?media=$1 last;
+		rewrite ^/_export/([^/]+)/(.*) /doku.php?do=export_$1&id=$2 last;
+		rewrite ^/(.*) /doku.php?id=$1 last;
+	}
+
+        location ~ \.php$ {
+                include fastcgi_params;
+                fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+                fastcgi_pass unix:/run/php/php7.0-fpm.sock;
+        }
+	# Block access to data folders
+	location ~ /(data|conf|bin|inc)/ {
+		deny all;
+	}
+	# Block access to .htaccess files
+	location ~ /\.ht {
+		deny  all;
+	}
+}

data/lib/charmkit/helpers/template.rb

@@ -2,9 +2,7 @@ require 'erb'
 
 module Charmkit
   module Helpers
-    # Processes templates
-    #
-    # template 'my-template.erb' '/etc/config/me.conf', service_name: "nginx"
+    # Helper for rendering file and inline templates
     class TemplateRenderer
       def self.empty_binding
         binding
@@ -17,9 +15,66 @@ module Charmkit
       end
     end
 
+    # Reads from a erb file and renders the content with context
+    #
+    # @param src String - file path of template
+    # @param dst String - file path location to save
+    # @param context Hash - parametized variables to pass to template
+    # @return Boolean
+    #
+    # @example
+    #     template('examples/my-demo-charm/templates/vhost.conf',
+    #              '/tmp/nginx-data.conf',
+    #              public_address: 'localhost',
+    #              app_path: '/srv/app')
     def template(src, dst, **context)
       rendered = TemplateRenderer.render(File.read(src), context)
       File.write(dst, rendered)
     end
+
+    # Reads from a embedded template in the rake task itself.
+    #
+    # @param src String - The data found after __END__
+    # @param dst String - Save location
+    # @param context Hash - variables to pass into template
+    # @return Boolean
+    #
+    # @example
+    #     inline_template('vhost.conf',
+    #                     '/etc/nginx/sites-enabled/default')
+    #                     server_name: "example.com")
+    #
+    #     __END__
+    #     @@ vhost.conf
+    #     server { name <%= server_name %> }
+    def inline_template(name, dst, **context)
+      templates = {}
+      begin
+        app, data = File.read(caller.first.split(":").first).split("__END__", 2)
+      rescue Errno::ENOENT
+        app, data = nil
+      end
+
+      data.strip!
+      if data
+        template = nil
+        data.each_line do |line|
+          if line =~ /^@@\s*(.*\S)\s*$/
+            template = String.new
+            templates[$1.to_s] = template
+          elsif
+            template << line
+          end
+        end
+
+        begin
+          rendered = TemplateRenderer.render(templates[name], context)
+        rescue
+          puts "Unable to load inline template #{name}"
+          exit 1
+        end
+        File.write(dst, rendered)
+      end
+    end
   end
 end

data/lib/charmkit/plugins/nginx.rb

@@ -1,8 +1,8 @@
 namespace :nginx do
   desc "Install NGINX"
   task :install do
-    `apt-get update`
-    `juju-log "Installing NGINX and its dependencies."`
-    `apt-get install -qyf nginx-full`
+    cmd.run "apt-get", "update"
+    cmd.run "juju-log", "Installing NGINX and its dependencies."
+    cmd.run "apt-get", "install", "-qyf", "nginx-full"
   end
 end

data/lib/charmkit/plugins/php.rb

@@ -12,8 +12,8 @@ namespace :php do
       'php-mbstring',
       'php-xml'
     ]
-    `apt-get update`
-    `juju-log "Installing PHP7 and its dependencies."`
-    `apt-get install -qyf #{pkgs.join(' ')}`
+    cmd.run "apt-get", "update"
+    cmd.run "juju-log", "Installing PHP7 and its dependencies."
+    cmd.run "apt-get", "install", "-qyf", pkgs.join(' ')
   end
 end

data/lib/charmkit/version.rb

@@ -6,7 +6,7 @@ module Charmkit
   module VERSION
     MAJOR = 0
     MINOR = 4
-    PATCH = 4
+    PATCH = 5
     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.4
+  version: 0.4.5
 platform: ruby
 authors:
 - Adam Stokes
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-06 00:00:00.000000000 Z
+date: 2016-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tty-command
@@ -130,6 +130,7 @@ files:
 - examples/my-demo-charm/templates/plugins.local.php
 - examples/my-demo-charm/templates/users.auth.php
 - examples/my-demo-charm/templates/vhost.conf
+- examples/render_inline.rb
 - lib/charmkit.rb
 - lib/charmkit/extend/string_tools.rb
 - lib/charmkit/helpers/runner.rb