depengine 3.0.20 → 3.0.21

data/spec/repository_spec.rb

@@ -13,40 +13,40 @@ require_relative '../lib/depengine/log/log'
 $log       = Log::DeploymentLogger.new
 $log.writer.level = Log4r::DEBUG
 
-describe "getting a file" do
-  context "with maven" do
-    it "should get from a remote repository" do
+describe 'getting a file' do
+  context 'with maven' do
+    it 'should get from a remote repository' do
       tmp_dir = Dir.mktmpdir
       begin
-        test = Provider::Repository.new()
-        test.repository = "http://repo1.maven.org/maven2/"
-        test.user = ""
-        test.password = ""
-        test.method = "maven"
+        test = Provider::Repository.new
+        test.repository = 'http://repo1.maven.org/maven2/'
+        test.user = ''
+        test.password = ''
+        test.method = 'maven'
 
-        test.get_from_repository("org/apache/maven/maven-model/2.2.1/maven-model-2.2.1.jar", tmp_dir)
-        File.file?(tmp_dir+'/maven-model-2.2.1.jar').should be true
+        test.get_from_repository('org/apache/maven/maven-model/2.2.1/maven-model-2.2.1.jar', tmp_dir)
+        File.file?(tmp_dir + '/maven-model-2.2.1.jar').should be true
       ensure
         FileUtils.remove_entry tmp_dir
       end
     end
   end
 
-  context "with SCP" do
-    it "should get a file from a remote host" do
+  context 'with SCP' do
+    it 'should get a file from a remote host' do
       tmp_dir = Dir.mktmpdir
       begin
-        FileUtils.mkdir tmp_dir+"/source"
-        FileUtils.touch tmp_dir+"/source/test.file"
+        FileUtils.mkdir tmp_dir + '/source'
+        FileUtils.touch tmp_dir + '/source/test.file'
 
-        test = Provider::Repository.new()
-        test.host = "localhost"
+        test = Provider::Repository.new
+        test.host = 'localhost'
         test.user = ENV['USER']
-        test.sshkey = ENV['HOME']+"/.ssh/id_rsa"
-        test.method = "scp"
+        test.sshkey = ENV['HOME'] + '/.ssh/id_rsa'
+        test.method = 'scp'
 
-        test.get_from_repository(tmp_dir+"/source/test.file", tmp_dir)
-        File.file?(tmp_dir+'/test.file').should be true
+        test.get_from_repository(tmp_dir + '/source/test.file', tmp_dir)
+        File.file?(tmp_dir + '/test.file').should be true
       ensure
         FileUtils.remove_entry tmp_dir
       end

data/spec/ssh_spec.rb

@@ -12,60 +12,59 @@ $log            = Log::DeploymentLogger.new
 $log.writer.level = Log4r::INFO
 $exec_file_path = __FILE__
 
-describe "the ssh publisher" do
-  it "should execute a command on a remote host" do
+describe 'the ssh publisher' do
+  it 'should execute a command on a remote host' do
     worker = Publisher::Ssh.new
     worker.remote_host  = 'localhost'
     worker.remote_user  = ENV['USER']
-    worker.ssh_key_file = ENV['HOME']+"/.ssh/id_rsa"
+    worker.ssh_key_file = ENV['HOME'] + '/.ssh/id_rsa'
 
-    result = ''
     result = worker.remote_execute('ls -l /')
-    result.should include("drwx")
+    result.should include('drwx')
   end
 
-  it "removes old releases" do
+  it 'removes old releases' do
     tmp_dir = Dir.mktmpdir
     begin
       elements = 10
       elements.times do |i|
-        random_time_in_the_past_days = (Time.now-25*60*60*i-((rand*10000).to_i))
-        FileUtils.mkdir_p(File.join(tmp_dir,random_time_in_the_past_days.strftime("%Y-%m-%d_%s")))
+        random_time_in_the_past_days = (Time.now - 25 * 60 * 60 * i - ((rand * 10_000).to_i))
+        FileUtils.mkdir_p(File.join(tmp_dir, random_time_in_the_past_days.strftime('%Y-%m-%d_%s')))
       end
-      Dir.glob(tmp_dir+"/*").size.should be elements
+      Dir.glob(tmp_dir + '/*').size.should be elements
 
       worker = Publisher::Ssh.new
       worker.remote_host  = 'localhost'
       worker.remote_user  = ENV['USER']
-      worker.ssh_key_file = ENV['HOME']+"/.ssh/id_rsa"
+      worker.ssh_key_file = ENV['HOME'] + '/.ssh/id_rsa'
 
-      newest_release = Time.now.strftime("%Y-%m-%d_%s")
+      newest_release = Time.now.strftime('%Y-%m-%d_%s')
       FileUtils.mkdir_p(File.join(tmp_dir, newest_release))
 
       worker.remove_old_releases(tmp_dir, 1, /[0-9]{4}\-[0-9]{2}\-[0-9]{2}_[0-9]+.*/)
-      Dir.glob(tmp_dir+"/*").size.should be 1
-      Dir.glob(tmp_dir+"/*").first.should include(newest_release)
+      Dir.glob(tmp_dir + '/*').size.should be 1
+      Dir.glob(tmp_dir + '/*').first.should include(newest_release)
 
     ensure
       FileUtils.remove_entry tmp_dir
     end
   end
 
-  context "when no previous release" do
-    it "does not remove anything" do
+  context 'when no previous release' do
+    it 'does not remove anything' do
       tmp_dir = Dir.mktmpdir
       begin
         worker = Publisher::Ssh.new
         worker.remote_host  = 'localhost'
         worker.remote_user  = ENV['USER']
-        worker.ssh_key_file = ENV['HOME']+"/.ssh/id_rsa"
+        worker.ssh_key_file = ENV['HOME'] + '/.ssh/id_rsa'
 
-        newest_release = Time.now.strftime("%Y-%m-%d_%s")
+        newest_release = Time.now.strftime('%Y-%m-%d_%s')
         FileUtils.mkdir_p(File.join(tmp_dir, newest_release))
 
         worker.remove_old_releases(tmp_dir, 2, /[0-9]{4}\-[0-9]{2}\-[0-9]{2}_[0-9]+.*/)
-        Dir.glob(tmp_dir+"/*").size.should be 1
-        Dir.glob(tmp_dir+"/*").first.should include(newest_release)
+        Dir.glob(tmp_dir + '/*').size.should be 1
+        Dir.glob(tmp_dir + '/*').first.should include(newest_release)
 
       ensure
         FileUtils.remove_entry tmp_dir

data/spec/template_spec.rb

@@ -13,77 +13,77 @@ require_relative '../lib/depengine/helper/validations'
 $log = Log::DeploymentLogger.new
 $log.writer.level = Log4r::ERROR
 
-describe "the template mechanism" do
+describe 'the template mechanism' do
 
-  context "given a string" do
-    it "should render a template" do
-      result = Processor::Template.parse(">Template< ><t:echo>Content</t:echo><", {})
-      expect(result).to include(">Template< >Content<")
+  context 'given a string' do
+    it 'should render a template' do
+      result = Processor::Template.parse('>Template< ><t:echo>Content</t:echo><', {})
+      expect(result).to include('>Template< >Content<')
     end
   end
 
-  context "given a single file as source" do
-    it "should render a template" do
+  context 'given a single file as source' do
+    it 'should render a template' do
       result = Processor::Template.parse('spec/templates/single.tpl', {})
-      expect(result).to include(">Template< >Content<")
+      expect(result).to include('>Template< >Content<')
     end
 
-    it "should create Tags from the content hash and provide it to the template" do
-      content = {'parameter' => 'value'}
+    it 'should create Tags from the content hash and provide it to the template' do
+      content = { 'parameter' => 'value' }
       result = Processor::Template.parse('spec/templates/single_hash.tpl', content)
-      expect(result).to include(">Template< >value<")
+      expect(result).to include('>Template< >value<')
     end
 
-    it "should honor the excludes" do
+    it 'should honor the excludes' do
       tmp_dir = Dir.mktmpdir
       begin
         worker = Processor::Template.new
         worker.basepath = File.join(File.dirname(__FILE__), 'templates')
-        worker.parse_template('base/sub1/single.tpl', {}, tmp_dir, {:excludes => ["single"]})
+        worker.parse_template('base/sub1/single.tpl', {}, tmp_dir, excludes: ['single'])
 
-        expect(File.file?(File.join(tmp_dir, "base/sub1/single"))).to be false
+        expect(File.file?(File.join(tmp_dir, 'base/sub1/single'))).to be false
       ensure
         FileUtils.remove_entry tmp_dir
       end
     end
 
-    it "should create a directory structure in analogy to the source tree" do
+    it 'should create a directory structure in analogy to the source tree' do
       tmp_dir = Dir.mktmpdir
       begin
         worker = Processor::Template.new
         worker.basepath = File.join(File.dirname(__FILE__), 'templates')
         worker.parse_template('base/sub1/single.tpl', {}, tmp_dir)
 
-        expect(File.open(File.join(tmp_dir,"base/sub1/single"), 'r').read).to include(">Template< >Content<")
+        expect(File.open(File.join(tmp_dir, 'base/sub1/single'), 'r').read).to include('>Template< >Content<')
       ensure
         FileUtils.remove_entry tmp_dir
       end
     end
   end
 
-  context "given a directory" do
-    it "should create a directory structure in analogy to the source tree" do
+  context 'given a directory' do
+    it 'should create a directory structure in analogy to the source tree' do
       tmp_dir = Dir.mktmpdir
       begin
         worker = Processor::Template.new
         worker.basepath = File.join(File.dirname(__FILE__), 'templates')
         worker.parse_template('base/sub2', {}, tmp_dir)
 
-        expect(File.open(File.join(tmp_dir, "base/sub2/multi2"), 'r').read).to include(">Template< >Content<")
+        expect(File.open(File.join(tmp_dir, 'base/sub2/multi2'), 'r').read).to include('>Template< >Content<')
       ensure
         FileUtils.remove_entry tmp_dir
       end
     end
 
-    it "should not use any excluded file" do
+    it 'should not use any excluded file' do
       tmp_dir = Dir.mktmpdir
       begin
         worker = Processor::Template.new
         worker.basepath = File.join(File.dirname(__FILE__), 'templates')
-        worker.parse_template('base/sub2', {}, tmp_dir, {:excludes => ["multi2"]})
+        worker.parse_template('base/sub2', {}, tmp_dir, excludes: ['multi2'])
 
-        expect(File.file?(File.join(tmp_dir, "base/sub2/multi2"))).to be false
-        expect(File.file?(File.join(tmp_dir, "base/sub2/multi1"))).to be true
+        expect(File.file?(File.join(tmp_dir, 'base/sub2/multi2'))).to be false
+        expect(File.file?(File.join(tmp_dir, 'base/sub2/multi1'))).to be true
       ensure
         FileUtils.remove_entry tmp_dir
       end
@@ -92,14 +92,14 @@ describe "the template mechanism" do
 end
 
 describe "the template DSL method 'parse_template'" do
-  it "calls the processor" do
+  it 'calls the processor' do
     tmp_dir = Dir.mktmpdir
-      begin
-        hack_object = Class.new.class.class_eval("include Deployment::Methods::Template")
-        hack_object.parse_template("base/sub1/single.tpl", tmp_dir, {}, {:basepath => File.join(File.dirname(__FILE__), 'templates'), })
-      ensure
-        FileUtils.remove_entry tmp_dir
-      end
+    begin
+      hack_object = Class.new.class.class_eval('include Deployment::Methods::Template')
+      hack_object.parse_template('base/sub1/single.tpl', tmp_dir, {}, basepath: File.join(File.dirname(__FILE__), 'templates'))
+    ensure
+      FileUtils.remove_entry tmp_dir
+    end
   end
 
 end

data/spec/zip_spec.rb

@@ -7,17 +7,17 @@ require_relative '../lib/depengine/log/log'
 $log       = Log::DeploymentLogger.new
 $log.writer.level = Log4r::ERROR
 
-describe "the zipper" do
+describe 'the zipper' do
   include Processor
 
-  it "should extract all files from an archive" do
+  it 'should extract all files from an archive' do
     tmp_dir = Dir.mktmpdir
     begin
-      unzip_file(File.join(File.dirname(__FILE__),'zip/source/dummy.zip'), tmp_dir)
-      File.file?(File.join(tmp_dir,'dummy1')).should be_true
-      File.file?(File.join(tmp_dir,'dummy2')).should be_true
-      File.file?(File.join(tmp_dir,'dummy3')).should be_true
-      File.file?(File.join(tmp_dir,'sub1/sub2/sub3/dummy4')).should be_true
+      unzip_file(File.join(File.dirname(__FILE__), 'zip/source/dummy.zip'), tmp_dir)
+      File.file?(File.join(tmp_dir, 'dummy1')).should be_true
+      File.file?(File.join(tmp_dir, 'dummy2')).should be_true
+      File.file?(File.join(tmp_dir, 'dummy3')).should be_true
+      File.file?(File.join(tmp_dir, 'sub1/sub2/sub3/dummy4')).should be_true
     ensure
       FileUtils.remove_entry tmp_dir
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: depengine
 version: !ruby/object:Gem::Version
-  version: 3.0.20
+  version: 3.0.21
 platform: ruby
 authors:
 - Team Automatisierung
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-01 00:00:00.000000000 Z
+date: 2014-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -192,6 +192,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.2.0
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.24.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.24.1
 description: Simply generates Depengine text.
 email:
 - team-automatisierung@sinnerschrader.com
@@ -203,6 +217,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
 - Gemfile
 - Gemfile.lock
 - Rakefile