cuken 0.1.13 → 0.1.15

data/lib/cuken/api/chef.rb

@@ -14,9 +14,25 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-require 'aruba/api' unless defined? ::Aruba::Api
+#require 'aruba/api' unless defined? ::Aruba::Api
 require 'chef'  unless defined? ::Chef
 require 'grit' unless defined? ::Grit
+#
+# Author:: Hedgehog (<hedgehogshiatus@gmail.com>)
+# Copyright:: Copyright (c) 2011 Hedgehog.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 require 'vagrant' unless defined? ::Vagrant
 require 'cuken/api/common'
 require 'cuken/api/chef/common'
@@ -30,6 +46,7 @@ module ::Cuken
     module Chef
 
       include ::Cuken::Api::Chef::Common
+      include ::Cuken::Api::Aruba::Api
 
       def append_cookbook_path(cookbook, lp, lrp)
         if lrp.exist?
@@ -70,28 +87,40 @@ module ::Cuken
         end
       end
 
-      def chef_clone_repo(ckbk_path, cookbook = false, repo = chef.remote_chef_repo, type = {'branch' => 'master'})
-        in_current_dir do
+      def chef_clone_repo(ckbk_path, cookbook = false, repo = chef.remote_chef_repo, type = {'branch' => 'master'}, deep_clone = true)
+        in_dir do
           pth = Pathname(ckbk_path).expand_path
-          gritty = ::Grit::Git.new(current_dir)
+          gritty = ::Grit::Git.new((pth + '.git').to_s)
           announce_or_puts gritty.inspect
-          clone_opts = {:quiet => false, :verbose => true, :progress => true}
+          clone_opts = {:depth => 1, :quiet => false, :verbose => true, :progress => true}
           type['branch'] = type['branch'].nil? ? '' : type['branch']
           type['tag'] = type['tag'].nil? ? '' : type['tag']
           type['ref'] = type['ref'].nil? ? '' : type['ref']
-          clone_opts[:branch] = type['branch'].empty? ? 'master' : type['branch']
+          clone_opts[:depth] = 1 unless deep_clone
           if pth.directory?
             announce_or_puts "Pulling: #{repo} into #{pth}"
-            res = gritty.pull(clone_opts, repo, pth.to_s)
+            FileUtils.cd(pth.to_s) do
+              res = gritty.pull(clone_opts, repo)
+            end
+            clone_opts[:branch] = type['branch'].empty? ? 'master' : type['branch']
           else
+            clone_opts[:branch] = type['branch'].empty? ? 'master' : type['branch']
             announce_or_puts "Cloning: #{repo} into #{pth}"
             res = gritty.clone(clone_opts, repo, pth.to_s)
+            Dir.chdir(pth.to_s) do
+              if ::File.exist?('.gitmodules')
+                cmd = "git submodule init"
+                announce_or_puts `#{cmd}`
+                cmd = "git submodule update"
+                announce_or_puts `#{cmd}`
+              end
+            end
           end
           clone_pull_error_check(res) if res
           update_cookbook_paths(pth, cookbook)
           unless chef.cookbooks_paths.empty?   # is empty after cloning default chef-repo
             grotty = ::Grit::Git.new((pth + '.git').to_s)
-            grotty.checkout( { :b => true }, clone_opts[:branch] )
+            grotty.checkout( { :B => clone_opts[:branch]||'master' } )
             if !type['tag'].empty? || !type['ref'].empty?
               grotty.checkout( { :B => true }, 'cuken', type['tag']||type['ref'] )
             else
@@ -102,6 +131,66 @@ module ::Cuken
         end
       end
 
+      def chef_submodule_repo(ckbk_path, cookbook = false, repo = chef.remote_chef_repo, type = {'branch' => 'master'}, deep_clone = true)
+        in_dir do
+          pth = (Pathname(chef.root_dir).expand_path)+ckbk_path
+          gritty = ::Grit::Git.new((pth + '.git').to_s)
+          announce_or_puts gritty.inspect
+          clone_opts = {:quiet => false, :verbose => true, :progress => true}
+          clone_opts[:depth] = 1 unless deep_clone
+          checkout = type['ref']||type['tag']||type['branch']||'master'
+          type['branch'] = type['branch'].nil? ? '' : type['branch']
+          type['tag'] = type['tag'].nil? ? '' : type['tag']
+          type['ref'] = type['ref'].nil? ? '' : type['ref']
+          res = nil
+          if pth.directory?
+               announce_or_puts "Updating submodule: #{repo} at #{pth}"
+              FileUtils.cd(pth.to_s) do
+                cmd = "git fetch"
+                res = `#{cmd}`
+                announce_or_puts res
+              end
+            clone_opts[:branch] = type['branch'].empty? ? 'master' : type['branch']
+          else
+            clone_opts[:branch] = type['branch'].empty? ? 'master' : type['branch']
+            announce_or_puts "Adding submodule: #{repo} at #{pth}"
+            FileUtils.cd(chef.root_dir) do
+              cmd = "git submodule add #{repo} #{pth.to_s}"
+              announce_or_puts `#{cmd}`
+            end
+            FileUtils.cd(pth.to_s) do
+              cmd = "git submodule init"
+              res = `#{cmd}`
+              announce_or_puts res
+              cmd = "git submodule update"
+              res = `#{cmd}`
+              announce_or_puts res
+            end
+          end
+          clone_pull_error_check(res) if res
+          update_cookbook_paths(pth, cookbook)
+          unless chef.cookbooks_paths.empty?   # is empty after cloning default chef-repo
+            grotty = ::Grit::Git.new((pth + '.git').to_s)
+            cmd = "git submodule add #{repo} #{pth.to_s}"
+            announce_or_puts `#{cmd}`
+            FileUtils.cd(pth.to_s) do
+              cmd = "git submodule init"
+              res = `#{cmd}`
+              announce_or_puts res
+              cmd = "git submodule update"
+              res = `#{cmd}`
+              announce_or_puts res
+              if !type['tag'].empty? || !type['ref'].empty?
+                grotty.checkout( { :B => true }, 'cuken', type['tag']||type['ref'] )
+              else
+                grotty.checkout( { :B => true }, 'cuken' )
+              end
+            end
+          end
+          pth
+        end
+      end
+
       def run_knife_command(cmd, interactive=false)
         no_ckbk_pth_opt = ['cookbook delete', 'role from file'].each{|str| break true if cmd[/#{str}/]}
         no_ckbk_pth = chef.cookbooks_paths.empty?
@@ -112,7 +201,7 @@ module ::Cuken
           ckbk_pth_opt = true
         end
         ckbk_pth_opt = false if no_ckbk_pth_opt.is_a? TrueClass
-        in_current_dir do
+        in_dir do
           unless chef.knife_config_file
             chef.knife_config_file = Pathname(chef.local_chef_repo).ascend { |d| h=d+'.chef'+'knife.rb'; break h if h.file? }
           end

data/lib/cuken/api/cmd.rb

@@ -1,9 +1,9 @@
-require 'aruba/api' unless defined? Aruba::Api
+#require 'aruba/api' unless defined? Aruba::Api
 
-module Cuken
-  module Api
-    module Cmd
-
-    end
-  end
-end
+#module Cuken
+#  module Api
+#    module Cmd
+#
+#    end
+#  end
+#end

data/lib/cuken/api/common.rb

@@ -1,4 +1,5 @@
-require 'aruba/api' unless defined? Aruba::Api
+require 'cuken/api/aruba'
+World(Cuken::Api::Aruba::Api)
 
 module ::Cuken
   module Api
@@ -16,29 +17,16 @@ module ::Cuken
         end
       end
 
-    end
-  end
-end
-
-#
-# We strip ANSI code from output strings.
-#
-module ::Aruba
-  class Process
-    def remove_ansi_codes(str)
-      str.gsub(/\e\[(\d+)m/, '')
-    end
-    def stdout
-      wait_for_io do
-        @out.rewind
-        remove_ansi_codes(@out.read)
-      end
-    end
-    def stderr
-      wait_for_io do
-        @err.rewind
-        remove_ansi_codes(@err.read)
+      def clone_pull_error_check(res)
+        if repo = res[/Could not find Repository /]
+          raise RuntimeError, "Could not find Repository #{repo}", caller
+        end
+        if repo = res[/ERROR: (.*) doesn't exist. Did you enter it correctly?/,1]
+          raise RuntimeError, "ERROR: #{repo} doesn't exist. Did you enter it correctly? #{repo}", caller
+        end
       end
+
     end
   end
 end
+

data/lib/cuken/api/file.rb

@@ -1,4 +1,4 @@
-require 'aruba/api' unless defined? Aruba::Api
+#require 'aruba/api' unless defined? Aruba::Api
 require 'etc'
 
 module Cuken
@@ -6,24 +6,24 @@ module Cuken
     module File
       include Etc
 
-      def check_file_content(file, partial_content, expect_match, times = 1)
-        regexp = regexp(partial_content)
-        seen_count = 0
-        prep_for_fs_check do
-          content = IO.read(file)
-          while (seen_count < times.to_i || content =~ regexp)do
-            if content =~ regexp
-              content = content.sub(regexp,'')
-              seen_count+=1
-            end
-          end
-          if expect_match
-            seen_count.should == times.to_i
-          else
-            seen_count.should_not == times.to_i
-          end
-        end
-      end
+#      def check_file_content(file, partial_content, expect_match, times = 1)
+#        regexp = regexp(partial_content)
+#        seen_count = 0
+#        prep_for_fs_check do
+#          content = IO.read(::File.expand_path(file))
+#          while (seen_count < times.to_i || content =~ regexp)do
+#            if content =~ regexp
+#              content = content.sub(regexp,'')
+#              seen_count+=1
+#            end
+#          end
+#          if expect_match
+#            seen_count.should == times.to_i
+#          else
+#            seen_count.should_not == times.to_i
+#          end
+#        end
+#      end
 
       def parse_mode(mode, octal=false)
         return mode.to_s if octal
@@ -35,21 +35,21 @@ module Cuken
       end
 
       def record_amtimes(filename)
-        in_current_dir do
+        in_dir do
           @recorded_mtime = ::File.mtime(filename)
           @recorded_atime = ::File.atime(filename)
         end
       end
 
       def check_modes(expected_mode, filename, octal = false)
-        in_current_dir do
+        in_dir do
           cstats = ::File.stat(filename)
           parse_mode(cstats.mode, octal).should match /#{expected_mode}\Z/# ].should_not be_nil
         end
       end
 
       def check_uid(dirname, owner)
-        in_current_dir do
+        in_dir do
           uid = ::Etc.getpwnam(owner).uid
           cstats = ::File.stat(dirname)
           cstats.uid.should == uid
@@ -57,7 +57,7 @@ module Cuken
       end
 
       def check_amtime_change(filename, time_type)
-        in_current_dir do
+        in_dir do
           case time_type
           when "m"
             current_mtime = ::File.mtime(filename)
@@ -70,9 +70,9 @@ module Cuken
       end
 
       def place_file(src, dst)
-        dest = Pathname(dst).expand_path.realdirpath
+        dest = Pathname(dst).expand_path
         FileUtils.mkdir_p((dest+src).dirname.to_s)
-        in_current_dir do
+        in_dir do
           opts = {:verbose => true, :preserve => true, :remove_destination => true}
           FileUtils.cp_r(src, (dest+src).to_s, opts).should be_nil
           FileUtils.compare_file(src, (dest+src).to_s).should be_true
@@ -82,22 +82,22 @@ module Cuken
       def place_folder_contents(dest_dir_name, src_dir_name)
         dest = Pathname(dest_dir_name).expand_path.realdirpath
         dest_parent = dest.dirname.to_s
-        FileUtils.mkdir_p((dest+src_dir_name).to_s)
-        in_current_dir do
+        ::FileUtils.mkdir_p((dest+src_dir_name).to_s)
+        in_dir do
           opts = {:verbose => true, :preserve => true, :remove_destination => true}
-          FileUtils.cp_r(src_dir_name+'/.', dest.to_s, opts).should be_nil
+          ::FileUtils.cp_r(src_dir_name+'/.', dest.to_s, opts).should be_nil
         end
-        Dir.glob("#{src_dir_name}/**/*").each do |fn|
-          if File.file?(fn)
-            fn2 = File.join(dest_parent, fn)
-            FileUtils.compare_file(fn, fn2).should be_true
+        ::Dir.glob("#{src_dir_name}/**/*").each do |fn|
+          if ::File.file?(fn.to_s)
+            fn2 = ::File.join(dest_parent, fn)
+            ::FileUtils.compare_file(fn, fn2).should be_true if ::File.file?(fn2.to_s)
           end
         end
       end
 
       def check_placed_file_content(file, partial_content, expect_match)
         prep_for_placed_fs_check do
-          content = IO.read(file)
+          content = IO.read(::File.expand_path(file))
           if expect_match
             content.should include partial_content
           else
@@ -115,9 +115,9 @@ module Cuken
         prep_for_placed_fs_check do
           paths.each do |path|
             if expect_presence
-              ::File.should be_file(path)
+              Pathname(path).expand_path.should be_file
             else
-              ::File.should_not be_file(path)
+              Pathname(path).expand_path.should_not be_file
             end
           end
         end
@@ -127,11 +127,11 @@ module Cuken
         prep_for_placed_fs_check do
           paths.each do |path|
             if expect_presence
-              dest = Pathname(path).expand_path.realdirpath
+              dest = Pathname(path).expand_path
               Pathname(dest).mkpath
-              Pathname(path).should be_directory
+              Pathname(path).expand_path.should be_directory
             else
-              Pathname(path).should_not be_directory
+              Pathname(path).expand_path.should_not be_directory
             end
           end
         end

data/lib/cuken/api/git/clone.rb

@@ -0,0 +1,25 @@
+#
+# Author:: Hedgehog (<hedgehogshiatus@gmail.com>)
+# Copyright:: Copyright (c) 2011 Hedgehog.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+module ::Cuken
+  module Api
+    module Git
+      module Clone
+
+      end
+    end
+  end
+end

data/lib/cuken/api/git/common.rb

@@ -0,0 +1,37 @@
+#
+# Author:: Hedgehog (<hedgehogshiatus@gmail.com>)
+# Copyright:: Copyright (c) 2011 Hedgehog.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+module ::Cuken
+  module Api
+    module Git
+      module Common
+
+        include ::Grit
+        ::Grit.debug = true
+        attr_accessor :git_uri,
+                      :local_git_repo,
+                      :remote_git_repo
+
+
+        def git
+          @remote_git_repo ||= "git://github.com/cookbooks/chef-repo.git"
+          @git ||= self
+        end
+
+      end
+    end
+  end
+end

data/lib/cuken/api/git/remote.rb

@@ -0,0 +1,16 @@
+#
+# Author:: Hedgehog (<hedgehogshiatus@gmail.com>)
+# Copyright:: Copyright (c) 2011 Hedgehog.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#

data/lib/cuken/api/git/repository.rb

@@ -0,0 +1,62 @@
+#
+# Author:: Hedgehog (<hedgehogshiatus@gmail.com>)
+# Copyright:: Copyright (c) 2011 Hedgehog.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+module ::Cuken
+  module Api
+    module Git
+      module Repository
+
+        def parse_to_repository_path(hsh)
+          case
+            when not(hsh['repo'].nil? || hsh['repo'].empty?)
+              ckbk = hsh['repo']
+              ckbk_src = "#{ckbk}"
+            when not(hsh['repository'].nil? || hsh['repository'].empty?)
+              ckbk = hsh['repository']
+              ckbk_src = "#{ckbk}"
+            else
+              src =""
+          end
+          return ckbk, ckbk_src
+        end
+
+        def check_repository_table_presence(table, expect_presence = true, curr_dir = current_dir)
+          table.hashes.each do |hsh|
+            ckbk, ckbk_src = parse_to_repository_path(hsh)
+            full_repo_src = ckbk
+            announce_or_puts(%{Looking for repository: #{full_repo_src}}) if @announce_env
+            check_repository_presence(full_repo_src, expect_presence, curr_dir)
+          end
+        end
+
+        def check_repository_presence(repo, expect_presence = true, curr_dir = current_dir)
+          in_dir(curr_dir) do |pn|
+            curr_path = Pathname(pn).basename.to_s
+            condition = Pathname(pn).exist?
+            given_repo = Pathname(repo).basename.to_s if repo
+            result = given_repo == curr_path
+            if condition && result
+              given_repo.should == curr_path
+              announce_or_puts(%{Found cookbook: #{pn}}) if @announce_env
+            end
+          end
+        end
+
+      end
+    end
+  end
+end
+

data/lib/cuken/api/git.rb

@@ -0,0 +1,69 @@
+#
+# Author:: Hedgehog (<hedgehogshiatus@gmail.com>)
+# Copyright:: Copyright (c) 2011 Hedgehog.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+require 'grit' unless defined? ::Grit
+require 'cuken/api/common'
+require 'cuken/api/git/common'
+require 'cuken/api/git/clone'
+require 'cuken/api/git/remote'
+require 'cuken/api/git/repository'
+
+module ::Cuken
+  module Api
+    module Git
+
+      include ::Cuken::Api::Git::Common
+      include ::Cuken::Api::Git::Clone
+      include ::Cuken::Api::Git::Repository
+      include ::Cuken::Api::Aruba::Api
+
+      #TODO: Refactor with chef_clone_repo method
+      def git_clone_repo(repo_path, repo = git.remote_git_repo, type = {'branch' => 'master'} , deep_clone = true)
+        in_dir do
+          pth = Pathname(repo_path).expand_path
+          gritty = ::Grit::Git.new((pth + '.git').to_s)
+          announce_or_puts gritty.inspect
+          clone_opts = {:quiet => false, :verbose => true, :progress => true}
+          clone_opts[:depth] = 1 unless deep_clone
+          type['branch'] = type['branch'].nil? ? '' : type['branch']
+          type['tag'] = type['tag'].nil? ? '' : type['tag']
+          type['ref'] = type['ref'].nil? ? '' : type['ref']
+          if pth.directory?
+            announce_or_puts "Pulling: #{repo} into #{pth}"
+            FileUtils.cd(pth.to_s) do
+              res = gritty.pull(clone_opts, repo)
+            end
+            clone_opts[:branch] = type['branch'].empty? ? 'master' : type['branch']
+          else
+            clone_opts[:branch] = type['branch'].empty? ? 'master' : type['branch']
+            announce_or_puts "Cloning: #{repo} into #{pth}"
+            res = gritty.clone(clone_opts, repo, pth.to_s)
+          end
+          clone_pull_error_check(res) if res
+          grotty = ::Grit::Git.new((pth + '.git').to_s)
+          grotty.checkout( { :B => clone_opts[:branch]||'master' } )
+          if !type['tag'].empty? || !type['ref'].empty?
+            grotty.checkout( { :B => true }, 'cuken', type['tag']||type['ref'] )
+          else
+            grotty.checkout( { :B => true }, 'cuken' )
+          end
+          pth
+        end
+      end
+
+    end
+  end
+end

data/lib/cuken/api/rvm/common.rb

@@ -0,0 +1,10 @@
+module ::Cuken
+  module Api
+    module Rvm
+      module Common
+      end
+    end
+  end
+end
+
+

data/lib/cuken/api/rvm/gemsets.rb

@@ -0,0 +1,33 @@
+module ::Cuken
+  module Api
+    module Rvm
+      module Gemsets
+
+        include ::Cuken::Api::Rvm::Common
+        #include ::Cuken::Api::Aruba::Api
+
+        def check_gemset_activation(gemset, expect_active = true)
+          if expect_active
+            rvm.current.environment_name.should match(gemset)
+          else
+            rvm.current.environment_name.should_not match(gemset)
+          end
+        end
+
+        def check_gemset_presence(gemsets, expect_presence = true)
+          if expect_presence
+            gemsets.each do |gs|
+              rvm.gemset.list.include?(gs).should be_true
+            end
+          else
+            gemsets.each do |gs|
+              pending "this is failing for some reason"
+              rvm.gemset.list.include?(gs).should be_false
+            end
+          end
+        end
+
+      end
+    end
+  end
+end