jeni 0.2.1 → 0.2.3

data/History.txt

@@ -4,6 +4,18 @@
 == History
 
 
+[jeni-0.2.3 21-Nov-2012]
+
+  Generate templates to /tmp directory before transferring to target. Allow users to
+  generate to an alternative target directory, either with target= method or optparse.
+  Allow a block for optparse that passes through the optparse object to allow custom
+  options to be added. Add classify method so templates can convert e.g. project name
+  into a Ruby class (my_project -> MyProject).
+
+[jeni-0.2.2 15-Nov-2012]
+
+  Ensure new users/groups are remember for subsequent user/group tests
+
 [jeni-0.2.1 26-Oct-2012]
 
   Added relative paths to targets that can take /usr/ or /usr/local as their root.

data/lib/jeni/actions.rb

@@ -153,7 +153,7 @@ module Jeni
       puts target if @verbose
       
       # and write it out to the target, but make it a temp
-      temp_file = target_file + "._temp"
+      temp_file = File.join('/tmp', File.basename(target_file) + "._temp")
       File.open(temp_file, 'w') do |tfile|
         target.each_line do |tline|
           tfile.puts tline

data/lib/jeni/options.rb

@@ -68,6 +68,11 @@ module Jeni
       @target_root = '/usr/'
     end
     
+    # set the default target root to the value given
+    def target=(path)
+      @target_root = path
+    end
+    
   end
   
 end

data/lib/jeni/optparse.rb

@@ -73,6 +73,15 @@ module Jeni
         @target_root = '/usr/'
       end
       
+      opts.on('-t', '--target [PATH]', String, 'set the default target to value given') do |t|
+        @target_root = t
+      end
+      
+      
+      if block_given? then
+        yield(opts)
+      end
+      
       opts.on_tail('-h', '--help', 'you are looking at it') do
         puts opts
         exit 0

data/lib/jeni/utils.rb

@@ -79,13 +79,13 @@ module Jeni
     def check_user(user)
       Etc.getpwnam(user)
     rescue ArgumentError
-      @errors[:no_user] = "User does not exist: #{user}"
+      @errors[:no_user] = "User does not exist: #{user}" unless @new_users.include?(user)
     end
     
     def check_group(group)
       Etc.getgrnam(group)
     rescue ArgumentError
-      @errors[:group] = "Group does not exist: #{group}"
+      @errors[:group] = "Group does not exist: #{group}" unless @new_groups.include?(group)
     end
     
     # check there is no user
@@ -114,6 +114,8 @@ module Jeni
       return skip
     rescue ArgumentError
       # will get here if user does NOT exist  
+      @new_users << user
+      @new_groups << user if opts.has_key?(:user_group)
       return false # do not skip!
     end
     
@@ -134,6 +136,7 @@ module Jeni
       return skip
     rescue ArgumentError
       # will get here if user does NOT exist 
+      @new_groups << group
       return false
     end
     
@@ -151,6 +154,16 @@ module Jeni
       end
     end
     
+    # convert a filename etc to a proper class name
+    # For example, converts 'my_service' to 'MyService'
+    #
+    # @param [String] string to convert to a classname
+    # @return [String] converted classname
+    def classify(string)
+      string = string.sub(/^[a-z\d]*/) { $&.capitalize }
+      string.gsub(/(?:_|(\/))([a-z\d]*)/) { "#{$1}#{$2.capitalize}" }.gsub('/', '::')
+    end
+    
     
     # helper to add commands for options
     def process_options(opts, target)

data/lib/jeni/version.rb

@@ -1,14 +1,17 @@
 # Created by Jevoom
 #
-# 26-Oct-2012
-#   Added relative paths to targets that can take /usr/ or /usr/local as their root.
-#   Got rspec tests to work
+# 21-Nov-2012
+#   Generate templates to /tmp directory before transferring to target. Allow users to
+#   generate to an alternative target directory, either with target= method or optparse.
+#   Allow a block for optparse that passes through the optparse object to allow custom
+#   options to be added. Add classify method so templates can convert e.g. project name
+#   into a Ruby class (my_project -> MyProject).
 
 module Jeni
-  # version set to 0.2.1
-  Version = '0.2.1'
-  # date set to 26-Oct-2012
-  Version_Date = '26-Oct-2012'
-  #ident string set to: jeni-0.2.1 26-Oct-2012
-  Ident = 'jeni-0.2.1 26-Oct-2012'
+  # version set to 0.2.3
+  Version = '0.2.3'
+  # date set to 21-Nov-2012
+  Version_Date = '21-Nov-2012'
+  #ident string set to: jeni-0.2.3 21-Nov-2012
+  Ident = 'jeni-0.2.3 21-Nov-2012'
 end

data/lib/jeni.rb

@@ -70,6 +70,9 @@ module Jeni
       @errors = {}
       @owner = nil
       @gem_dir = nil
+      # record any new users and groups requested
+      @new_users = Array.new
+      @new_groups = Array.new
       if block_given? then
         yield self
       else
@@ -255,6 +258,7 @@ module Jeni
     # @option opts [String] :home path to home directory for user, defaults to /home/$user
     # @option opts [String] :shell path to shell for user, defaults to /bin/bash
     # @option opts [Boolean] :skip set true to skip if user exists else fail
+    # @option opts [Boolean] :user_group to create a user group for this user
     #
     def user(name, opts={})
       skip = opts[:skip]

data/spec/jeni_utils_spec.rb

@@ -29,6 +29,8 @@ class JeniUtils
     @app_name = 'jeni'
     @errors = {}
     @commands = []
+    @new_users = Array.new
+    @new_groups = Array.new
     @source_root = File.expand_path(File.dirname(__FILE__) + '/../test/examples')
   end
   attr_accessor :errors
@@ -238,9 +240,11 @@ describe Jeni do
       puts err
     end
     @jeni.errors?.should be_false
-    @jeni.check_new_user("peppapig", {:uid=>10101}, false)
+    @jeni.check_new_user("peppapiglet", {:uid=>10101}, false)
     @jeni.errors?.should be_false
-    @jeni.check_new_user("peppapig", {:uid=>10101, :home=>'/home/peppa', :shell=>'/bin/bourne'}, false)
+    @jeni.check_new_user("peppapiglet", {:uid=>10101, :home=>'/home/peppa', :shell=>'/bin/bourne'}, false)
+    @jeni.errors?.should be_false
+    @jeni.check_user("peppapiglet")
     @jeni.errors?.should be_false
   end
   
@@ -268,6 +272,8 @@ describe Jeni do
     @jeni.errors?.should be_false
     @jeni.check_new_group("piglets", {:gid=>10101}, false)
     @jeni.errors?.should be_false
+    @jeni.check_group("piglets")
+    @jeni.errors?.should be_false
   end
   
   it "should throw errors for invalid groups" do

data/test/examples/target/jeni_template.rb

@@ -1,5 +1,5 @@
 # Author: Robert Sharp
-# Created at: 16:14 25-10-12
+# Created at: 15:12 13-11-12
 
 module Amodule
   class Aclass

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: jeni
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - Dr Robert
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-26 00:00:00 Z
+date: 2012-11-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :runtime
@@ -119,17 +119,6 @@ files:
 - test/examples/target/jeni_template.rb
 - test/examples/target/shebang.rb
 - test/examples/target2/subfiles/subfile_1.rb
-- test/examples/target2/jeni_test.rb
-- test/examples/target2/jeni.rb
-- test/examples/target2/shebang.rb
-- test/examples/target2/executable
-- test/examples/target2/template.haml.rb
-- test/examples/target2/coati.haml.conf
-- test/examples/target2/jeni-diff.rb
-- test/examples/target2/jeni_template.rb
-- test/examples/target2/coati.conf
-- test/examples/target2/std_template.rb
-- test/examples/target2/jeni_link.rb
 homepage: 
 licenses: 
 - Open Software Licence v3.0

data/test/examples/target2/coati.conf

@@ -1,36 +0,0 @@
-upstream coati {
-        server unix:/home/robert/dev/rails/coati/tmp/.sock fail_timeout=0;
-    }
-
-
-server {
-            listen   192.168.0.20:80;
-            server_name coati.lucius.osburn-sharp.ath.cx;
-
-            access_log /home/robert/dev/rails/coati/log/access.log;
-            error_log /home/robert/dev/rails/coati/log/error.log;
-
-            root   /home/robert/dev/rails/coati/public/;
-            index  index.html;
-
-            location / {
-                          proxy_set_header  X-Real-IP  $remote_addr;
-                          proxy_set_header  X-Forwarded-For $proxy_add_x_forwarded_for;
-                          proxy_set_header Host $http_host;
-                          proxy_redirect off;
-
-                          if (-f $request_filename/index.html) {
-                                           rewrite (.*) $1/index.html break;
-                          }
-
-                          if (-f $request_filename.html) {
-                                           rewrite (.*) $1.html break;
-                          }
-
-                          if (!-f $request_filename) {
-                                           proxy_pass http://coati;
-                                           break;
-                          }
-            }
-
-}

data/test/examples/target2/coati.haml.conf

@@ -1,37 +0,0 @@
-upstream coati {
-        server unix:#{root}/tmp/.sock fail_timeout=0;
-    }
-
-
-server {
-            listen   192.168.0.20:80;
-            server_name #{app_name}.lucius.osburn-sharp.ath.cx;
-
-            access_log #{root}/log/access.log;
-            error_log #{root}/log/error.log;
-
-            root   #{root}/public/;
-            index  index.html;
-
-            location / {
-                          proxy_set_header  X-Real-IP  $remote_addr;
-                          proxy_set_header  X-Forwarded-For $proxy_add_x_forwarded_for;
-                          proxy_set_header Host $http_host;
-                          proxy_redirect off;
-
-                          if (-f $request_filename/index.html) {
-                                           rewrite (.*) $1/index.html break;
-                          }
-
-                          if (-f $request_filename.html) {
-                                           rewrite (.*) $1.html break;
-                          }
-
-                          if (!-f $request_filename) {
-                                           proxy_pass http://coati;
-                                           break;
-                          }
-            }
-
-}
-

data/test/examples/target2/executable

@@ -1,3 +0,0 @@
-#!/usr/bin/env ruby18
-
-puts "Executing"

data/test/examples/target2/jeni-diff.rb

@@ -1,64 +0,0 @@
-#
-# Author:: R.J.Sharp
-# Email:: robert(a)osburn-sharp.ath.cx
-# Copyright:: Copyright (c) 2012 
-# License:: Open Software Licence v3.0
-#
-# This software is licensed for use under the Open Software Licence v. 3.0
-# The terms of this licence can be found at http://www.opensource.org/licenses/osl-3.0.php
-# and in the file LICENCE. Under the terms of this licence, all derivative works
-# must themselves be licensed under the Open Software Licence v. 3.0
-#
-# 
-# [requires go here]
-require 'rubygems'
-require 'jerbil'
-
-# = Jeni
-#
-# [Description of the main module]
-module Jeni
-  class Installer
-    
-    def initialize(gem_name)
-      @gem_name = gem_name
-      @gem_spec = Gem::Specification.find_by_name(@gem_name)
-      @commands = []
-    end
-    
-    def self.construct(gem_name, options={}, &block)
-      @pretend = options[:pretend] || true # JUST FOR NOW!
-      installer = self.new(gem_name)
-      block.call(installer)
-      return self
-    end
-    
-    def run!(pretent=false)
-      
-    end
-    
-    # copy a file from the source, relative to the gem home to the target
-    # which is absolute
-    def file(source, target, opts={})
-      @commands << {:file => {source => target}}
-      if opts.has_key?(:chown) then
-        @commands << {:chown => opts[:chown]}
-      end
-    end
-    
-    # copy all of the files in a directory
-    def directory(source, target, opts={})
-      
-    end
-    
-    # create a wrapper at target to call source
-    def wrapper(source, target)
-      
-    end
-    
-    def link(source, target)
-      
-    end
-    
-  end
-end

data/test/examples/target2/jeni.rb

@@ -1,63 +0,0 @@
-#
-# Author:: R.J.Sharp
-# Email:: robert(a)osburn-sharp.ath.cx
-# Copyright:: Copyright (c) 2012 
-# License:: Open Software Licence v3.0
-#
-# This software is licensed for use under the Open Software Licence v. 3.0
-# The terms of this licence can be found at http://www.opensource.org/licenses/osl-3.0.php
-# and in the file LICENCE. Under the terms of this licence, all derivative works
-# must themselves be licensed under the Open Software Licence v. 3.0
-#
-# 
-# [requires go here]
-require 'rubygems'
-
-# = Jeni
-#
-# [Description of the main module]
-module Jeni
-  class Installer
-    
-    def initialize(gem_name)
-      @gem_name = gem_name
-      @gem_spec = Gem::Specification.find_by_name(@gem_name)
-      @commands = []
-    end
-    
-    def self.construct(gem_name, options={}, &block)
-      @pretend = options[:pretend] || true # JUST FOR NOW!
-      installer = self.new(gem_name)
-      block.call(installer)
-      return self
-    end
-    
-    def run!(pretent=false)
-      
-    end
-    
-    # copy a file from the source, relative to the gem home to the target
-    # which is absolute
-    def file(source, target, opts={})
-      @commands << {:file => {source => target}}
-      if opts.has_key?(:chown) then
-        @commands << {:chown => opts[:chown]}
-      end
-    end
-    
-    # copy all of the files in a directory
-    def directory(source, target, opts={})
-      
-    end
-    
-    # create a wrapper at target to call source
-    def wrapper(source, target)
-      
-    end
-    
-    def link(source, target)
-      
-    end
-    
-  end
-end

data/test/examples/target2/jeni_link.rb

@@ -1,63 +0,0 @@
-#
-# Author:: R.J.Sharp
-# Email:: robert(a)osburn-sharp.ath.cx
-# Copyright:: Copyright (c) 2012 
-# License:: Open Software Licence v3.0
-#
-# This software is licensed for use under the Open Software Licence v. 3.0
-# The terms of this licence can be found at http://www.opensource.org/licenses/osl-3.0.php
-# and in the file LICENCE. Under the terms of this licence, all derivative works
-# must themselves be licensed under the Open Software Licence v. 3.0
-#
-# 
-# [requires go here]
-require 'rubygems'
-
-# = Jeni
-#
-# [Description of the main module]
-module Jeni
-  class Installer
-    
-    def initialize(gem_name)
-      @gem_name = gem_name
-      @gem_spec = Gem::Specification.find_by_name(@gem_name)
-      @commands = []
-    end
-    
-    def self.construct(gem_name, options={}, &block)
-      @pretend = options[:pretend] || true # JUST FOR NOW!
-      installer = self.new(gem_name)
-      block.call(installer)
-      return self
-    end
-    
-    def run!(pretent=false)
-      
-    end
-    
-    # copy a file from the source, relative to the gem home to the target
-    # which is absolute
-    def file(source, target, opts={})
-      @commands << {:file => {source => target}}
-      if opts.has_key?(:chown) then
-        @commands << {:chown => opts[:chown]}
-      end
-    end
-    
-    # copy all of the files in a directory
-    def directory(source, target, opts={})
-      
-    end
-    
-    # create a wrapper at target to call source
-    def wrapper(source, target)
-      
-    end
-    
-    def link(source, target)
-      
-    end
-    
-  end
-end

data/test/examples/target2/jeni_template.rb

@@ -1,10 +0,0 @@
-# Author: Me
-# Created at: 16:15 25-10-12
-
-module Amodule
-  class Aclass
-    def amethod
-      puts "Welcome and well met"
-    end
-  end
-end

data/test/examples/target2/jeni_test.rb

@@ -1,63 +0,0 @@
-#
-# Author:: R.J.Sharp
-# Email:: robert(a)osburn-sharp.ath.cx
-# Copyright:: Copyright (c) 2012 
-# License:: Open Software Licence v3.0
-#
-# This software is licensed for use under the Open Software Licence v. 3.0
-# The terms of this licence can be found at http://www.opensource.org/licenses/osl-3.0.php
-# and in the file LICENCE. Under the terms of this licence, all derivative works
-# must themselves be licensed under the Open Software Licence v. 3.0
-#
-# 
-# [requires go here]
-require 'rubygems'
-
-# = Jeni
-#
-# [Description of the main module]
-module Jeni
-  class Installer
-    
-    def initialize(gem_name)
-      @gem_name = gem_name
-      @gem_spec = Gem::Specification.find_by_name(@gem_name)
-      @commands = []
-    end
-    
-    def self.construct(gem_name, options={}, &block)
-      @pretend = options[:pretend] || true # JUST FOR NOW!
-      installer = self.new(gem_name)
-      block.call(installer)
-      return self
-    end
-    
-    def run!(pretent=false)
-      
-    end
-    
-    # copy a file from the source, relative to the gem home to the target
-    # which is absolute
-    def file(source, target, opts={})
-      @commands << {:file => {source => target}}
-      if opts.has_key?(:chown) then
-        @commands << {:chown => opts[:chown]}
-      end
-    end
-    
-    # copy all of the files in a directory
-    def directory(source, target, opts={})
-      
-    end
-    
-    # create a wrapper at target to call source
-    def wrapper(source, target)
-      
-    end
-    
-    def link(source, target)
-      
-    end
-    
-  end
-end

data/test/examples/target2/shebang.rb

@@ -1,3 +0,0 @@
-#! /usr/bin/ruby -w
-
-puts "Just a test"

data/test/examples/target2/std_template.rb

@@ -1,12 +0,0 @@
-# THIS IS A STANDARD TEMPLATE
-# Author: Robert
-# Created at: 16:15 25-10-12
-
-module Amodule
-  class Aclass
-    def amethod
-      puts "How do you do?"
-    end
-  end
-end
-# the standard

data/test/examples/target2/template.haml.rb

@@ -1,10 +0,0 @@
-# Author: #{author}
-# Created at: #{Time.now.strftime("%H:%M %d-%m-%y")}
-
-module Amodule
-  class Aclass
-    def amethod
-      puts "#{greeting}"
-    end
-  end
-end