cupper 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4cb1f5ee3842ee97e25770577a390f8547a47e3a
-  data.tar.gz: c2e64363e16d0d940d9a542fec515b1524d93b1c
+  metadata.gz: c5222cb608fedc123c84ca945f2885f4e5609f9f
+  data.tar.gz: 0ee85f347f7e47b8b149ae7db5ba0a8e0e3405c9
 SHA512:
-  metadata.gz: c4216eeb5b6377d1e1240b15dde4b585fc347a1e34d1188529b0e7ffc0a8337626e80f24dc1cb35153e11080f4b1e4ac267590660591744343a9103499581fda
-  data.tar.gz: 394040efd699a88b89d51ff7361abc483f93b9b034fb90929d79c033201bdbac469425819c6c15a75274677285b4d5673d25ea404b09f4863e555d1e290bcb84
+  metadata.gz: 0631c79f3a2fd563f65f10b7f5eef51fd90a25b885e5044547e767a5e617c2915e84203f2eb53e48ec1c3be35074d5c29cb3de303c9c1d7f857f0fe05a4ac6b6
+  data.tar.gz: 7d54800377105f0d8112195e279192a8b5d5aa6d1ce585922136e1d2e0ec04fe40ab3ca0d0e189705c138e935bb72816db5c090b282f90d6ca6be7a2f0de9689

data/.gitignore

@@ -7,3 +7,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+/*.gem

data/lib/cupper/cookbook.rb

@@ -10,12 +10,12 @@ module Cupper
       @cookbook_files_path = "#{@cookbook_path}/files"
       @cookbook_recipes_path = "#{@cookbook_path}/recipes"
       @recipe_deps = [ # TODO this is hard code to reflect all_recipes. Refactor this later
-        "#{cookbookname}::cookbook_file",
+        "#{cookbookname}::packages",
+        "#{cookbookname}::cookbook_files",
         "#{cookbookname}::links",
         "#{cookbookname}::groups",
         "#{cookbookname}::services",
         "#{cookbookname}::users",
-        "#{cookbookname}::packages",
       ]
       setup_paths
     end
@@ -30,7 +30,6 @@ module Cupper
       collector = Collect.new
       collector.setup
       all_recipes(collector)
-      all_cookbook_files(collector)
     end
 
     def all_recipes(collector)
@@ -42,30 +41,5 @@ module Cupper
       Recipe.new(@cookbook_recipes_path, collector, '_users', 'users').create
       Recipe.new(@cookbook_recipes_path, collector, '_package', 'packages').create
     end
-
-    def all_cookbook_files(collector)
-      expand_cookbook_files(collector.extract 'files')
-    end
-
-    def text_type?(file)
-      file[1]['type'].match('text') or file[1]['type'].match('ASCII')
-    end
-
-    def expand_cookbook_files(files)
-      files.each do |attr|
-        if text_type?(attr) and !(attr[1]['related'].nil?)
-          source = attr[0].split('/').last
-          content = attr[1]['content']
-          CookbookFile.new(@cookbook_files_path, source, content, 'cookbook_file').create
-        end
-        # TODO: This is a work around to source list file
-        #   should be replaced for a better logic
-        if text_type?(attr) and attr[0].include? "/etc/apt/sources.list"
-          source = attr[0].split('/').last
-          content = attr[1]['content']
-          CookbookFile.new(@cookbook_files_path, source, content, 'cookbook_file').create
-        end
-      end
-    end
   end
 end

data/lib/cupper/recipe.rb

@@ -14,47 +14,22 @@ module Cupper
       @links        = Array.new
       @directories  = Array.new
       @files        = Array.new
+      @files_path   = "#{dest_path.chomp("recipes")}/files"
       @collector    = collector
       super(recipe_name, dest_path, erb_file, nil, '.rb')
     end
 
     def create
-      @sources_list  = expand_sources_list(@collector.extract 'files')
-      @packages = expand_packages(@collector.extract 'packages')
-      @services = expand_services(@collector.extract 'services')
-      @users    = expand_users(@collector.extract 'users')
-      @groups   = expand_groups(@collector.extract 'groups')
-      @links    = expand_links(@collector.extract 'files')
-      @files    = expand_files(@collector.extract 'files')
+      @sources_list   = expand_sources_list(@collector.extract 'files')
+      @packages       = expand_packages(@collector.extract 'packages')
+      @services       = expand_services(@collector.extract 'services')
+      @users          = expand_users(@collector.extract 'users')
+      @groups         = expand_groups(@collector.extract 'groups')
+      @links          = expand_links(@collector.extract 'files')
+      @files          = expand_files(@collector.extract 'files')
       super
     end
 
-    def expand_sources_list(files)
-      att = Array.new
-      files.each do |attr|
-        # TODO: Doesn't works for arch, this should be a plugin responsability
-        if attr[0].include?("/etc/apt/sources.list") and (convert_mode(attr[1]['mode']) != 'Unknown') and text_type?(attr)
-          path = attr[0]
-          group = attr[1]['group']
-          mode = attr[1]['mode']
-          owner = attr[1]['owner']
-          att.push(new_file(group, mode, owner, path))
-        end
-      end
-      att
-    end
-
-    def expand_packages(packages)
-      att = Array.new
-      packages.each do |attr|
-        pkg = attr[0]
-        version = attr[1]['version']
-
-        att.push(new_package(pkg,version))
-      end
-      att
-    end
-
     def link_type?(file)
       (file[1]['type'].split.first(2).join(' ').match('symbolic link'))
     end
@@ -82,6 +57,33 @@ module Cupper
       result
     end
 
+
+    def expand_sources_list(files)
+      att = Array.new
+      files.each do |attr|
+        # TODO: Doesn't works for arch, this should be a plugin responsability
+        if attr[0].include?("/etc/apt/sources.list") and (convert_mode(attr[1]['mode']) != 'Unknown') and text_type?(attr)
+          path = attr[0]
+          group = attr[1]['group']
+          mode = attr[1]['mode']
+          owner = attr[1]['owner']
+          att.push(new_file(group, mode, owner, path))
+        end
+      end
+      att
+    end
+
+    def expand_packages(packages)
+      att = Array.new
+      packages.each do |attr|
+        pkg = attr[0]
+        version = attr[1]['version']
+
+        att.push(new_package(pkg,version))
+      end
+      att
+    end
+
     def expand_services(services)
       att = Array.new
       services.each do |attr|
@@ -138,13 +140,17 @@ module Cupper
     def expand_files(files)
       att = Array.new
       files.each do |attr|
-        if text_type?(attr) and !(attr[1]['related'].nil?)
+        if text_type?(attr) and (!(attr[1]['related'].nil?) or attr[0].include? "/etc/apt/sources.list")
           path = attr[0]
           group = attr[1]['group']
           mode = attr[1]['mode']
           owner = attr[1]['owner']
-
           att.push(new_file(group, mode, owner, path))
+
+          # Related file
+          source = attr[0].split('/').last
+          content = attr[1]['content']
+          CookbookFile.new(@files_path, source, content, 'cookbook_file').create
         end
       end
       att

data/lib/cupper/templates/_cookbook_file.erb

@@ -1,7 +1,7 @@
 # Cookbook_file Session
 
 <% for @cbf in @files %>
-cookbook_file '<%= @cbf.path %>'
+cookbook_file '<%= @cbf.path %>' do
   owner '<%= @cbf.owner %>'
   group '<%= @cbf.group %>'
   mode '<%= @cbf.mode %>'

data/lib/cupper/version.rb

@@ -1,3 +1,3 @@
 module Cupper
-  VERSION = '0.1.0'.freeze
+  VERSION = '0.1.1'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cupper
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Paulo Tada