branch has been merged and all test are ok

Rakefile

@@ -31,7 +31,7 @@ RSpec::Core::RakeTask.new(:spec_puppet) do |t|
 end
 desc "Run spec tests on an existing fixtures directory (for Ruby code)"
 RSpec::Core::RakeTask.new(:spec_ruby) do |t|
-  t.rspec_opts = ['--color --order rand']
+  t.rspec_opts = ['--color']
   t.verbose = true
   t.pattern = 'spec/{unit,functions,hosts,integration,types}/**/*_spec.rb'
 end

lib/puppet/provider/jboss_deploy/jbosscli.rb

@@ -3,121 +3,8 @@
 Puppet::Type.type(:jboss_deploy).provide(:jbosscli,
     :parent => Puppet_X::Coi::Jboss::Provider::AbstractJbossCli) do
 
-  def create
-    deploy
-  end
+desc 'JBoss CLI deploy provider'
 
-  def destroy
-    undeploy
-  end
-
-  def refresh
-    undeploy unless @resource[:redeploy]
-    deploy
-  end
-
-  def name_exists?
-    res = executeWithoutRetry "deployment-info --name=#{@resource[:name]}"
-    if res[:result] == false
-        return false
-    end
-    for line in res[:lines]
-      line.strip!
-      if line =~ /^#{@resource[:name]}[ ]+/
-        Puppet.debug "Deployment found: #{line}"
-        return true
-      end
-    end
-    Puppet.debug "No deployment matching #{@resource[:name]} found."
-    return false
-  end
-
-  def is_exact_deployment?
-    true
-  end
-
-  def exists?
-    if name_exists?
-      is_exact_deployment?
-    else
-      false
-    end
-  end
-
-  def servergroups
-    if not @resource[:runasdomain]
-      return @resource[:servergroups]
-    end
-    servergroups = @resource[:servergroups]
-    res = execute("deployment-info --name=#{@resource[:name]}")
-    if not res[:result]
-      return []
-    end
-    groups = []
-    for line in res[:lines]
-        line.strip!
-        depinf = line.split
-        if(depinf[1] == "enabled" || depinf[1] == "added")
-            groups.push(depinf[0])
-        end
-    end
-    if servergroups.nil? or servergroups.empty? or servergroups == ['']
-      return servergroups
-    end
-    return groups
-  end
-
-  def runtime_name_param
-    if @resource[:runtime_name].nil?
-      return ''
-    else
-      return "--runtime-name=#{@resource[:runtime_name]}"
-    end
-  end
-
-
-  def servergroups=(value)
-    if not @resource[:runasdomain]
-      return nil
-    end
-    current = servergroups()
-    Puppet.debug(current.inspect())
-    Puppet.debug(value.inspect())
-
-    toset = value - current
-    cmd = "deploy --name=#{@resource[:name]} --server-groups=#{toset.join(',')} #{runtime_name_param}"
-    res = bringUp('Deployment', cmd)
-  end
-
-  def deploy
-    cmd = "deploy #{@resource[:source]} --name=#{@resource[:name]} #{runtime_name_param}"
-    if @resource[:runasdomain]
-      servergroups = @resource[:servergroups]
-      if servergroups.nil? or servergroups.empty? or servergroups == ['']
-        cmd = "#{cmd} --all-server-groups"
-      else
-        cmd = "#{cmd} --server-groups=#{servergroups.join(',')}"
-      end
-    end
-    if @resource[:redeploy]
-      cmd = "#{cmd} --force"
-    end
-    isprintinglog = 100
-    bringUp 'Deployment', cmd
-  end
-
-  def undeploy
-    cmd = "undeploy #{@resource[:name]}"
-    if @resource[:runasdomain]
-      servergroups = @resource[:servergroups]
-      if servergroups.nil? or servergroups.empty? or servergroups == ['']
-        cmd = "#{cmd} --all-relevant-server-groups"
-      else
-        cmd = "#{cmd} --server-groups=#{@resource[:servergroup]}"
-      end
-    end
-    isprintinglog = 0
-    bringDown 'Deployment', cmd
-  end
+include Puppet_X::Coi::Jboss::Provider::Deploy
 
 end

lib/puppet_x/coi/jboss/configuration.rb

@@ -5,6 +5,10 @@ class << self
 
     @config = nil
 
+    # Test method that return current version(for comatability with ruby 1.8)
+    def ruby_version
+       RUBY_VERSION
+    end
 
     # Add settings of jboss configuration file to facts
     def add_config_facts
@@ -18,7 +22,7 @@ def add_config_facts
         end
         Facter.add(:jboss_fullconfig) do
           setcode do
-            if RUBY_VERSION < '1.9.0'
+            if Puppet_X::Coi::Jboss::Configuration.ruby_version < '1.9.0'
               class << config
                 define_method(:to_s, proc { self.inspect })
               end

lib/puppet_x/coi/jboss/provider/deploy.rb

@@ -1,82 +1,116 @@
 # A class for JBoss deploy
 module Puppet_X::Coi::Jboss::Provider::Deploy
-  def create
-    cmd = "deploy #{@resource[:source]} --name=#{@resource[:name]}"
-    if @resource[:runasdomain]
-      groups = @resource[:servergroups]
-      if groups.nil? or groups.empty? or groups == ['']
-        cmd = "#{cmd} --all-server-groups"
-      else
-        cmd = "#{cmd} --server-groups=#{groups.join(',')}"
-      end
+    def create
+      deploy
     end
-    if @resource[:redeploy]
-      cmd = "#{cmd} --force"
+
+    def destroy
+      undeploy
+    end
+
+    def refresh
+      undeploy unless @resource[:redeploy]
+      deploy
+    end
+
+    def is_exact_deployment?
+      true
     end
-    isprintinglog = 100
-    bringUp 'Deployment', cmd
-  end
 
-  def destroy
-    cmd = "undeploy #{@resource[:name]}"
-    if @resource[:runasdomain]
-      groups = @resource[:servergroups]
-      if groups.nil? or groups.empty? or groups == ['']
-        cmd = "#{cmd} --all-relevant-server-groups"
+    def exists?
+      if name_exists?
+        is_exact_deployment?
       else
-        cmd = "#{cmd} --server-groups=#{groups.join(',')}"
+        false
       end
     end
-    isprintinglog = 0
-    bringDown 'Deployment', cmd
-  end
 
-  def exists?
-    if name_exists?
-      is_exact_deployment?
-    else
-      false
+    def servergroups
+      if not @resource[:runasdomain]
+        return @resource[:servergroups]
+      end
+      servergroups = @resource[:servergroups]
+      res = execute("deployment-info --name=#{@resource[:name]}")
+      if not res[:result]
+        return []
+      end
+      groups = []
+      for line in res[:lines]
+          line.strip!
+          depinf = line.split
+          if(depinf[1] == "enabled" || depinf[1] == "added")
+              groups.push(depinf[0])
+          end
+      end
+      if servergroups.nil? or servergroups.empty? or servergroups == ['']
+        return servergroups
+      end
+      return groups
     end
-  end
 
-  def servergroups
-    if not @resource[:runasdomain]
-      return @resource[:servergroups]
+    def servergroups=(value)
+      if not @resource[:runasdomain]
+        return nil
+      end
+      current = servergroups()
+      Puppet.debug(current.inspect())
+      Puppet.debug(value.inspect())
+
+      toset = value - current
+      cmd = "deploy --name=#{@resource[:name]} --server-groups=#{toset.join(',')}#{runtime_name_param_with_space_or_empty_string}"
+      res = bringUp('Deployment', cmd)
     end
-    servergroups = @resource[:servergroups]
-    res = execute("deployment-info --name=#{@resource[:name]}")
-    if not res[:result]
-      return []
+
+    private
+
+    def runtime_name_param
+      if @resource[:runtime_name].nil?
+        ''
+      else
+        "--runtime-name=#{@resource[:runtime_name]}"
+      end
     end
-    groups = []
-    for line in res[:lines]
-        line.strip!
-        depinf = line.split
-        if(depinf[1] == "enabled" || depinf[1] == "added")
-            groups.push(depinf[0])
+
+    def runtime_name_param_with_space_or_empty_string
+        if @resource[:runtime_name].nil?
+            ''
+        else
+            " #{runtime_name_param}"
         end
     end
-    if servergroups.nil? or servergroups.empty? or servergroups == ['']
-      return servergroups
-    end
-    return groups
-  end
 
-  def servergroups=(value)
-    if not @resource[:runasdomain]
-      return nil
+    def deploy
+      cmd = "deploy #{@resource[:source]} --name=#{@resource[:name]}#{runtime_name_param_with_space_or_empty_string}"
+      if @resource[:runasdomain]
+        servergroups = @resource[:servergroups]
+        if servergroups.nil? or servergroups.empty? or servergroups == ['']
+          cmd = "#{cmd} --all-server-groups"
+        else
+          cmd = "#{cmd} --server-groups=#{servergroups.join(',')}"
+        end
+      end
+      if @resource[:redeploy]
+        cmd = "#{cmd} --force"
+      end
+      isprintinglog = 100
+      bringUp 'Deployment', cmd
     end
-    current = servergroups()
-    Puppet.debug(current.inspect())
-    Puppet.debug(value.inspect())
 
-    toset = value - current
-    cmd = "deploy --name=#{@resource[:name]} --server-groups=#{toset.join(',')}"
-    res = bringUp('Deployment', cmd)
-  end
+    def undeploy
+      cmd = "undeploy #{@resource[:name]}"
+      if @resource[:runasdomain]
+        servergroups = @resource[:servergroups]
+        if servergroups.nil? or servergroups.empty? or servergroups == ['']
+          cmd = "#{cmd} --all-relevant-server-groups"
+        else
+          cmd = "#{cmd} --server-groups=#{servergroups.join(',')}"
+        end
+      end
+      isprintinglog = 0
+      bringDown 'Deployment', cmd
+    end
 
-  private
-  def name_exists?
+    def name_exists?
     res = executeWithoutRetry "/deployment=#{@resource[:name]}:read-resource()"
     if res[:outcome] == 'failed'
         return false
@@ -89,8 +123,5 @@ def name_exists?
     return false
   end
 
-  def is_exact_deployment?
-    true
-  end
 
 end

spec/unit/provider/jboss_datasource/jbosscli_spec.rb

@@ -69,7 +69,7 @@
       end
       let(:status) { double(:exitstatus => 0) }
       before :each do
-        re = /.*bin\/jboss-cli.sh --timeout=50000 --connect --file=.+jbosscli.* --controller=127.0.0.1:9999/
+        re = /.*\/bin\/jboss-cli\.sh  --connect --file=.*jbosscli.* --controller=127\.0\.0\.1:[0-9]*/
         expect(Puppet_X::Coi::Jboss::Provider::AbstractJbossCli).to receive(:last_execute_status).
           at_least(:once).and_return(status)
         expect(Puppet_X::Coi::Jboss::Provider::AbstractJbossCli).to receive(:execshell).

spec/unit/provider/jboss_deploy/jboss_deploy_spec.rb

@@ -64,7 +64,7 @@
         bringDownName = 'Deployment'
         cmd = 'deploy /usr/src/super-crm-1.1.0.war --name=super-crm-1.1.0 --server-groups=crm-servers'
 
-        expect(provider).to receive(:bringUp).with(bringDownName, cmd ).and_return('asd')
+        expect(provider).to receive(:bringUp).with(bringDownName, cmd   ).and_return('asd')
       end
 
       let(:extended_repl) { {
@@ -80,7 +80,7 @@
         bringDownName = 'Deployment'
         cmd = 'deploy /usr/src/super-crm-1.1.0.war --name=super-crm-1.1.0 --all-server-groups --force'
 
-        expect(provider).to receive(:bringUp).with(bringDownName, cmd ).and_return('asd')
+        expect(provider).to receive(:bringUp).with(bringDownName, cmd).and_return('asd')
       end
       let(:extended_repl) { {
           :redeploy => true,