puppi 0.0.1alpha → 0.0.2

data/.travis.yml

@@ -5,7 +5,5 @@ rvm:
   - 1.9.3
   - jruby-18mode # JRuby in 1.8 mode
   - jruby-19mode # JRuby in 1.9 mode
-  - rbx-18mode
-  - rbx-19mode
 # uncomment this line if your project needs to run something other than `rake`:
 script: RUN_ENV=TEST bundle exec rspec spec

data/Gemfile

@@ -3,6 +3,10 @@ source "http://rubygems.org"
 gem 'mail'
 gem 'rake'
 
+group :development do
+  gem 'pry'
+end
+
 group :test do
   gem 'autotest'
   gem 'rspec'

data/lib/puppi.rb

@@ -11,11 +11,14 @@ module Puppi
   require 'puppi/notifications/stdout'
   require 'puppi/version'
   require 'yaml'
+  require 'pry'
   
   if ENV["RUN_ENV"] == "TEST"
     @@puppidir = File.dirname(File.dirname(__FILE__))+"/tmp/config"
+    @@stdout_print = false
   else
     @@puppidir = "/etc/puppi"
+    @@stdout_print = true
   end
   
   class << self
@@ -23,6 +26,10 @@ module Puppi
       @@puppidir
     end
     
+    def stdout_print
+      @@stdout_print
+    end
+    
     def initial_checks
       directories = %w[ data helpers notifications ]
       directories.each do |directory|

data/lib/puppi/action.rb

@@ -35,16 +35,21 @@ module Puppi
     private
     def run_command command, module_helper
       @running_command = prepare_command command.command
-      output = IO.popen(@running_command, :err => [:child, :out]) unless @running_command.nil?
+      output = IO.popen(@running_command) unless @running_command.nil?
       output.nil? ? nil : output.read
     end
     
     def prepare_command command
       begin
-        command % @loaded_datafile.variables
-      rescue KeyError
-        nil
-      end 
+        @loaded_datafile.variables.each do |index, value|
+          command.gsub!("%{"+index.to_s+"}", value.to_s)
+        end
+        raise StandardError unless command.match(/%\{[a-z]*\}/).nil?
+        command
+      rescue
+        puts "Malformed Datafile"
+        exit 1
+      end
     end
   end
 end

data/lib/puppi/generate_sample_data.rb

@@ -23,7 +23,8 @@ module Puppi
 name: openssh
 version: 1.0'
       write_file '/data/standard_hostname.yml', '--- 
-name: hostname'
+name: hostname
+version: 0.1'
     end
     
     def notifications

data/lib/puppi/notification.rb

@@ -33,8 +33,11 @@ module Puppi
     
     private
     def valid_method? (method)
-      @valid_methods = Puppi::Notifications.constants.select {|c| Class === Puppi::Notifications.const_get(c)}
-      @valid_methods.include? method.capitalize.to_sym
+      @valid_methods = Array.new
+      Puppi::Notifications.constants.each do |valid_method|
+        @valid_methods << valid_method.to_s
+      end
+      @valid_methods.include? method.capitalize
     end
   end
 end

data/lib/puppi/notifications/mail.rb

@@ -12,7 +12,7 @@ module Puppi
         mails = load_all
         mails.each do |mail|
           mailer = @loader.load_notification(mail)
-          send_mail (mailer) if valid_mailer? (mailer)
+          send_mail (mailer) if valid_mailer?(mailer)
         end
       end
       

data/lib/puppi/notifications/stdout.rb

@@ -5,7 +5,7 @@ module Puppi
       end
       
       def output(output)
-        puts output
+        puts output if Puppi::stdout_print
       end
     end
   end

data/lib/puppi/version.rb

@@ -1,3 +1,3 @@
 module Puppi
-  VERSION = "0.0.1alpha"
+  VERSION = "0.0.2"
 end

data/puppi.gemspec

@@ -27,4 +27,9 @@ EOF
   # specify any dependencies here; for example:
   # s.add_development_dependency "rspec"
   # s.add_runtime_dependency "rest-client"
+  s.add_development_dependency "autotest"
+  s.add_development_dependency "rspec"
+  s.add_development_dependency "fakefs"
+  s.add_development_dependency "simplecov"
+  s.add_runtime_dependency "mail"
 end

data/spec/puppi/action_spec.rb

@@ -44,13 +44,13 @@ describe "Puppi::Action" do
     output.should include("+ openssh +\n")
   end
   
+  subject { Puppi::Action.new({:action => 'check', :puppi_module => nil}).output }
   it "should return all command output when running check command" do
-    output = Puppi::Action.new({:action => 'check', :puppi_module => nil}).output
-    output.should be_an(Array)
-    output.should have(4).items
-    output.should include("| hostname |\n")
-    output.should include(nil)
-    output.should include("| openssh |\n")
-    output.should include("| 1.0 |\n")
+    should be_an(Array)
+    should have(4).items
+    should include("| hostname |\n")
+    should include("| 0.1 |\n")
+    should include("| openssh |\n")
+    should include("| 1.0 |\n")
   end
 end

data/spec/puppi/generate_sample_data_spec.rb

@@ -37,7 +37,8 @@ version: 1.0'
   it "should the standard datafile for hostname module" do
     standard_helper = File.open(Puppi::puppidir+'/data/standard_hostname.yml', 'rb') { |file| file.read }
     standard_helper.should eql '--- 
-name: hostname'
+name: hostname
+version: 0.1'
   end
   
   it "should generate the standard notification to user1@mail.com for mail method" do

data/spec/puppi/loader_spec.rb

@@ -48,7 +48,7 @@ describe "Puppi::Loader" do
     it "should load all hostname standard data file" do
       @p = @loader.load_datafile('standard_hostname')
       @p.should be_a(Puppi::Files::Datafile)
-      @p.variables.should have(1).items
+      @p.variables.should have(2).items
     end
   
     it "should raise an exception for a invalid data file" do

metadata

@@ -1,28 +1,105 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: puppi
-version: !ruby/object:Gem::Version
-  version: 0.0.1alpha
-  prerelease: 5
+version: !ruby/object:Gem::Version 
+  hash: 27
+  prerelease: 
+  segments: 
+  - 0
+  - 0
+  - 2
+  version: 0.0.2
 platform: ruby
-authors:
+authors: 
 - Celso Fernandes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-06 00:00:00.000000000 Z
-dependencies: []
-description: ! "Puppi is a Puppet module that lets sysadmins standardize, manage and
-  automate the deployment of web applications \nand provides quick and standard commands
-  to obtain informations about the system and what’s is going on it.\n\nIts structure
-  provides FULL flexibility on the actions required for virtually any kind of application
-  deployment \nand information gathering.\n"
-email:
+
+date: 2012-08-19 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
+  type: :development
+  name: autotest
+  requirement: *id001
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
+  type: :development
+  name: rspec
+  requirement: *id002
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
+  type: :development
+  name: fakefs
+  requirement: *id003
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
+  type: :development
+  name: simplecov
+  requirement: *id004
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
+  type: :runtime
+  name: mail
+  requirement: *id005
+description: "Puppi is a Puppet module that lets sysadmins standardize, manage and automate the deployment of web applications \n\
+  and provides quick and standard commands to obtain informations about the system and what\xE2\x80\x99s is going on it.\n\n\
+  Its structure provides FULL flexibility on the actions required for virtually any kind of application deployment \n\
+  and information gathering.\n"
+email: 
 - fernandes@zertico.com
-executables:
+executables: 
 - puppi
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .autotest
 - .gitignore
 - .rvmrc
@@ -32,9 +109,6 @@ files:
 - Rakefile
 - autotest/discover.rb
 - bin/puppi
-- etc/data/standard_openssh.yaml
-- etc/helpers/standard.yaml
-- etc/t.rb
 - lib/puppi.rb
 - lib/puppi/action.rb
 - lib/puppi/files/datafile.rb
@@ -61,32 +135,38 @@ files:
 - spec/support/publicize_methods.rb
 homepage: http://fernandes.github.com/puppi
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: -3422487645257531727
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>'
-    - !ruby/object:Gem::Version
-      version: 1.3.1
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: puppi
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Puppet module to manage applications deployments and servers local management
-test_files:
+test_files: 
 - spec/core/rake_task.rb
 - spec/puppi/action_spec.rb
 - spec/puppi/files/datafile_spec.rb

data/etc/data/standard_openssh.yaml

@@ -1,59 +0,0 @@
---- 
-  name: openssh
-  config_file_mode: "0644"
-  puppi_helper: standard
-  monitor_tool: puppi nagios munin
-  manage_file: present
-  manage_monitor: true
-  source_dir_purge: false
-  bool_debug: false
-  title: openssh
-  data_dir: /etc/ssh
-  config_file_init: /etc/sysconfig/sshd
-  firewall: false
-  source_dir: ""
-  caller_module_name: openssh
-  port: "22"
-  log_file: /var/log/messages
-  service: sshd
-  firewall_tool: ""
-  bool_firewall: false
-  protocol: tcp
-  config_file_owner: root
-  process: sshd
-  puppi: "true"
-  monitor_target: 0.0.0.0
-  manage_file_replace: true
-  config_file_group: root
-  process_user: root
-  firewall_src: 0.0.0.0/0
-  bool_absent: false
-  manage_package: present
-  service_status: true
-  package: openssh-server
-  monitor: "yes"
-  disableboot: false
-  template: ""
-  manage_service_ensure: running
-  manage_firewall: true
-  config_file: /etc/ssh/sshd_config
-  config_dir: /etc/ssh
-  bool_disableboot: false
-  bool_monitor: true
-  bool_audit_only: false
-  module_name: openssh
-  process_args: ""
-  debug: "no"
-  disable: false
-  bool_disable: false
-  bool_puppi: true
-  log_dir: /var/log
-  pid_file: /var/run/sshd.pid
-  audit_only: false
-  absent: false
-  source: ""
-  my_class: ""
-  manage_service_enable: true
-  firewall_dst: 10.42.20.10
-  options: ""
-  bool_source_dir_purge: false

data/etc/helpers/standard.yaml

@@ -1,13 +0,0 @@
---- 
-:info: 
-  -
-    :command: "rpm -qi $package_name"
-    :description: "show package info"
-  -
-    :command: "service $service_name"
-    :description: "show service info"
-:check:
-  -
-    :command: "chk_port $port"
-    :description: "checks port"
-

data/etc/t.rb

@@ -1,9 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'rubygems'
-require 'pry'
-require File.dirname(__FILE__) + '/lib/puppi'
-
-require 'puppi'
-
-binding.pry