minimart 1.1.3 → 1.1.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MTlhN2I5YzFkZWJmZGQwNTgxMjZlYzdlNDZkNjRhMDk4NTVmMjdlYQ==
+    MjlkNTAzOTQ2YjM4YzNjNGQwNTE0NmE1NTY3MzMzZjlmYTdiZWJmOQ==
   data.tar.gz: !binary |-
-    OWY3MzQ4ZDk5MTdlMjM0ZGRmZTNiZGFhYmI5MzIzZGVhMTA3NTdlYw==
+    NzE5OTFlZDI3MjdkZmU2OGRlNjczZDZhN2YxNWQ0ZTYzNzk2ZDI5MQ==
 SHA512:
   metadata.gz: !binary |-
-    ZGMyYzAzZTUyZDA3ZGRlNTZkNjZkZDc2YzAxNzAyYTNiYmU3NDIyZmI5MWEx
-    NGM3ZjcxNWE5ZmRjOTE2YjEzOWYyZjU1NTAyYjUxNWJmMzI3ZjJlN2ViZmRj
-    ZDI0ZWQ3YjA2NzZkMzk0Nzk3NDQxYWMyMTJmZDcxYmEwZGZjNDk=
+    ZmIzZGQ0YzA4MWI2MTQxMGZhMDk2NjMzMjk1YzgxMTE5NDAyMDk2OGRiMDVm
+    Y2IzNWExN2Q5ZTJlYzY3YjU2MTE5ZWNkM2VlMDVjOGJjMDAyYmEzZTI4N2Mw
+    OTZhYWI0NDQzMmRjM2FlYWQ2ZjVkYWZmOTlhYjlmYzNkYTg2NzE=
   data.tar.gz: !binary |-
-    ZTI3MGY1MDk2NWQ5MDJiNDI0MWI1YmM1NjQzODU3YjA2YjkyZGJkNmYzNzZk
-    NTRlNjM3YTcxMDk0ZjEzZDM4YzYwMDkzNDMyNDljNWFjYmE3NTYxM2Y2NmRm
-    NTRjODllOGJlNWQ5NTQ3OGJiMTMzZmIzMzE3OGYwNzZhNzNhMWY=
+    NjQ3ODcxNjY0Y2EwOWIwYjNhNTgwMGNiOThlMjE1NWVjMDQ5OGU3ODhjZGEz
+    ZjZhNDg5MTY3YTU1YzQzNWQxNDNlMzM5ZmI5OGVlMDcyOTQwZThlN2ZiZjRh
+    YTY5YjY1NzZiNWFiZmQyODU3ZWQyODBmNDFkM2VjZTZjMTRmYmQ=

data/.travis.yml

@@ -3,6 +3,9 @@ cache: bundler
 rvm:
   - 2.2.3
   - 2.1.7
+notifications:
+  flowdock:
+    secure: s2EpKpFFZJL51GChkIM/B8CpoiAvj56aYp7iSfKcD5aZvdBRssXXt9i3t39TA/hD8NkWfM07eVbhL3tGAv2GcXhTOlXZSoljzGdzFdGROZZd4asd1pLK8VuJTQrEKPDfKp/+XsIfbfOrTFf19qhBAfk5A0TRUXVMITiMkVIo1D4=
 deploy:
   provider: rubygems
   api_key:

data/lib/minimart/cookbook.rb

@@ -19,7 +19,7 @@ module Minimart
       new (Ridley::Chef::Cookbook.from_path(path))
     end
 
-    # @param [Ridley::Chef::Cookbok] raw_cookbook
+    # @param [Ridley::Chef::Cookbook] raw_cookbook
     def initialize(raw_cookbook)
       @raw_cookbook = raw_cookbook
     end
@@ -54,6 +54,18 @@ module Minimart
       metadata.maintainer
     end
 
+    # Get the source url of the cookbook
+    # @return [String]
+    def source_url
+      metadata.source_url
+    end
+
+    # Get the issues url of the cookbook
+    # @return [String]
+    def issues_url
+      metadata.issues_url
+    end
+
     # Get the path to the cookbook on the file system
     # @return [String]
     def path
@@ -112,7 +124,9 @@ module Minimart
         url:            cookbook_path(self),
         downloaded_at:  downloaded_at,
         download_date:  download_date,
-        platforms:      normalized_platforms
+        platforms:      normalized_platforms,
+        source_url:     source_url,
+        issues_url:     issues_url
       }
     end
 

data/lib/minimart/mirror/inventory_builder.rb

@@ -1,3 +1,4 @@
+require 'ridley'
 module Minimart
   module Mirror
 
@@ -33,10 +34,16 @@ module Minimart
       # precedence over information found elsewhere.
       def install_cookbooks_with_explicit_location
         inventory_requirements.each_with_explicit_location do |requirement|
-          requirement.fetch_cookbook do |cookbook|
-            validate_cookbook_against_local_store(cookbook, requirement)
-            add_artifact_to_graph(cookbook)
-            add_cookbook_to_local_store(cookbook.path, requirement.to_hash)
+          begin
+            requirement.fetch_cookbook do |cookbook|
+              validate_cookbook_against_local_store(cookbook, requirement)
+              add_artifact_to_graph(cookbook)
+              add_cookbook_to_local_store(cookbook.path, requirement.to_hash)
+            end
+          rescue Ridley::Errors::MissingNameAttribute
+            #handle Ridley::Errors::MissingNameAttribute and other cookbook specific errors by ignoring them.
+            #hopefuly the next version will be valid. eg. https://git.corp.adobe.com/EchoSignCommunity/apt/blob/1.5.0/metadata.rb
+            next 
           end
         end
       end

data/lib/minimart/version.rb

@@ -1,3 +1,3 @@
 module Minimart
-  VERSION = "1.1.3"
+  VERSION = "1.1.6"
 end

data/lib/minimart/web/html_generator.rb

@@ -1,3 +1,7 @@
+require 'sprockets'
+require 'sass'
+require 'uglifier'
+
 require 'minimart/web/dashboard_generator'
 require 'minimart/web/cookbook_show_page_generator'
 
@@ -8,11 +12,7 @@ module Minimart
     class HtmlGenerator
       include Minimart::Web::TemplateHelper
 
-      # @return [String] the directory to put any generated HTML in
-      attr_reader :web_directory
-
-      # @return [Minimart::Web::Cookbooks] the set of cookbooks to generate HTML for
-      attr_reader :cookbooks
+      attr_reader :web_directory, :cookbooks
 
       # @param [Hash] opts
       # @option opts [String] :web_directory The directory to put any generated HTML in
@@ -24,15 +24,39 @@ module Minimart
 
       # Generate any HTML!
       def generate
-        copy_assets
+        generate_assets
         generate_index
         generate_cookbook_show_pages
       end
 
       private
 
+      def generate_assets
+        generate_js
+        generate_css
+        copy_assets
+      end
+
       def copy_assets
-        FileUtils.cp_r(File.join(minimart_web_directory, 'assets'), web_directory)
+        FileUtils.cp_r(compiled_asset_directory, web_directory)
+      end
+
+      def generate_js
+        js_dir = Pathname.new(compiled_asset_directory).join('javascripts')
+        FileUtils.mkdir_p(js_dir)
+        sprockets = Sprockets::Environment.new(minimart_root_directory)
+        sprockets.js_compressor = :uglify
+        sprockets.append_path(Pathname.new(raw_asset_directory).join('javascripts'))
+        sprockets['manifest.js'].write_to(js_dir.join('application.min.js'))
+      end
+
+      def generate_css
+        css_dir = Pathname.new(compiled_asset_directory).join('stylesheets')
+        FileUtils.mkdir_p(css_dir)
+        sprockets = Sprockets::Environment.new(minimart_root_directory)
+        sprockets.css_compressor = :sass
+        sprockets.append_path(Pathname.new(raw_asset_directory).join('stylesheets'))
+        sprockets['manifest.css'].write_to(css_dir.join('application.min.css'))
       end
 
       def generate_index

data/lib/minimart/web/template_helper.rb

@@ -39,7 +39,19 @@ module Minimart
 
       # @return [String] The path to the Minimart web directory
       def minimart_web_directory
-        File.join(Minimart.root_path, '..', 'web')
+        File.join(minimart_root_directory, '..', 'web')
+      end
+
+      def minimart_root_directory
+        Minimart.root_path
+      end
+
+      def raw_asset_directory
+        File.join(minimart_web_directory, '_assets')
+      end
+
+      def compiled_asset_directory
+        File.join(minimart_web_directory, 'assets')
       end
 
       # Get the path for a web asset (CSS, JS, etc...)

data/minimart.gemspec

@@ -8,24 +8,29 @@ Gem::Specification.new do |spec|
   spec.version       = Minimart::VERSION
   spec.summary       = %q{MiniMart is a RubyGem that makes it simple to build a repository of Chef cookbooks using only static files.}
   spec.description   = %q{MiniMart is a RubyGem that makes it simple to build a repository of Chef cookbooks using only static files.}
-  spec.authors       = 'MadGlory'
+  spec.authors       = ['MadGlory', 'Todd Pickell', 'Others']
   spec.homepage      = 'http://electric-it.github.io/minimart/'
   spec.license       = 'Apache License, v2.0'
 
+  spec.required_ruby_version = ['~> 2.1', '~> 2.2']
+
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'git', '~> 1.2.6'
+  spec.add_dependency 'git', '~> 1.2', '>= 1.2.6'
   spec.add_dependency 'minitar', '~> 0.5'
-  spec.add_dependency 'octokit', '~> 3.7.0'
-  spec.add_dependency 'redcarpet', '~> 3.2'
+  spec.add_dependency 'octokit', '~> 3.7'
+  spec.add_dependency 'redcarpet', '= 3.3.2'
   spec.add_dependency 'rest-client', '~> 1.7'
   spec.add_dependency 'ridley', '~> 4.1'
-  spec.add_dependency 'solve', '~> 1.2.1'
+  spec.add_dependency 'solve', '~> 1.2', '>= 1.2.1'
   spec.add_dependency 'thor', '~> 0.19'
   spec.add_dependency 'tilt', '~> 2.0'
+  spec.add_dependency 'sprockets', '~> 3.5'
+  spec.add_dependency 'uglifier', '~> 2.7'
+  spec.add_dependency 'sass', '~> 3.4'
 
   spec.add_development_dependency 'bundler', '~> 1.7'
   spec.add_development_dependency 'rake', '~> 10.3'

data/spec/fixtures/bad_metadata_inventory.yml

@@ -0,0 +1,5 @@
+sources:
+  - "https://supermarket.getchef.com"
+cookbooks:
+  bad_metadata_cookbook:
+    path: spec/invalid/bad_metadata_cookbook

data/spec/fixtures/sample_cookbook/metadata.rb

@@ -5,5 +5,7 @@ license          'All rights reserved'
 description      'Installs/Configures sample_cookbook'
 long_description 'Installs/Configures sample_cookbook'
 version          '1.2.3'
+source_url       'https://github.com/electric-it/minimart'
+issues_url       'https://github.com/electric-it/minimart/issues'
 
 depends 'yum', '> 3.0.0'

data/spec/invalid/bad_metadata_cookbook/Berksfile

@@ -0,0 +1,3 @@
+source "https://supermarket.getchef.com"
+
+metadata

data/spec/invalid/bad_metadata_cookbook/CHANGELOG.md

@@ -0,0 +1,3 @@
+# 0.1.0
+
+Initial release of sample_cookbook

data/spec/invalid/bad_metadata_cookbook/Gemfile

@@ -0,0 +1,16 @@
+source 'https://rubygems.org'
+
+gem 'berkshelf'
+
+# Uncomment these lines if you want to live on the Edge:
+#
+# group :development do
+#   gem "berkshelf", github: "berkshelf/berkshelf"
+#   gem "vagrant", github: "mitchellh/vagrant", tag: "v1.6.3"
+# end
+#
+# group :plugins do
+#   gem "vagrant-berkshelf", github: "berkshelf/vagrant-berkshelf"
+#   gem "vagrant-omnibus", github: "schisamo/vagrant-omnibus"
+# end
+

data/spec/invalid/bad_metadata_cookbook/LICENSE

@@ -0,0 +1,3 @@
+Copyright (C) 2014 YOUR_NAME
+
+All rights reserved - Do Not Redistribute

data/spec/invalid/bad_metadata_cookbook/README.md

@@ -0,0 +1,42 @@
+# sample_cookbook-cookbook
+
+TODO: Enter the cookbook description here.
+
+## Supported Platforms
+
+TODO: List your supported platforms.
+
+## Attributes
+
+<table>
+  <tr>
+    <th>Key</th>
+    <th>Type</th>
+    <th>Description</th>
+    <th>Default</th>
+  </tr>
+  <tr>
+    <td><tt>['sample_cookbook']['bacon']</tt></td>
+    <td>Boolean</td>
+    <td>whether to include bacon</td>
+    <td><tt>true</tt></td>
+  </tr>
+</table>
+
+## Usage
+
+### sample_cookbook::default
+
+Include `sample_cookbook` in your node's `run_list`:
+
+```json
+{
+  "run_list": [
+    "recipe[sample_cookbook::default]"
+  ]
+}
+```
+
+## License and Authors
+
+Author:: YOUR_NAME (<YOUR_EMAIL>)

data/spec/invalid/bad_metadata_cookbook/Thorfile

@@ -0,0 +1,5 @@
+# encoding: utf-8
+
+require 'bundler'
+require 'bundler/setup'
+require 'berkshelf/thor'

data/spec/invalid/bad_metadata_cookbook/Vagrantfile

@@ -0,0 +1,90 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+# Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
+VAGRANTFILE_API_VERSION = '2'
+
+Vagrant.require_version '>= 1.5.0'
+
+Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
+  # All Vagrant configuration is done here. The most common configuration
+  # options are documented and commented below. For a complete reference,
+  # please see the online documentation at vagrantup.com.
+
+  config.vm.hostname = 'sample-cookbook-berkshelf'
+
+  # Set the version of chef to install using the vagrant-omnibus plugin
+  # NOTE: You will need to install the vagrant-omnibus plugin:
+  #
+  #   $ vagrant plugin install vagrant-omnibus
+  #
+  if Vagrant.has_plugin?
+    config.omnibus.chef_version = 'latest'
+  end
+
+  # Every Vagrant virtual environment requires a box to build off of.
+  # If this value is a shorthand to a box in Vagrant Cloud then
+  # config.vm.box_url doesn't need to be specified.
+  config.vm.box = 'chef/ubuntu-14.04'
+
+
+  # Assign this VM to a host-only network IP, allowing you to access it
+  # via the IP. Host-only networks can talk to the host machine as well as
+  # any other machines on the same network, but cannot be accessed (through this
+  # network interface) by any external networks.
+  config.vm.network :private_network, type: 'dhcp'
+
+  # Create a forwarded port mapping which allows access to a specific port
+  # within the machine from a port on the host machine. In the example below,
+  # accessing "localhost:8080" will access port 80 on the guest machine.
+
+  # Share an additional folder to the guest VM. The first argument is
+  # the path on the host to the actual folder. The second argument is
+  # the path on the guest to mount the folder. And the optional third
+  # argument is a set of non-required options.
+  # config.vm.synced_folder "../data", "/vagrant_data"
+
+  # Provider-specific configuration so you can fine-tune various
+  # backing providers for Vagrant. These expose provider-specific options.
+  # Example for VirtualBox:
+  #
+  # config.vm.provider :virtualbox do |vb|
+  #   # Don't boot with headless mode
+  #   vb.gui = true
+  #
+  #   # Use VBoxManage to customize the VM. For example to change memory:
+  #   vb.customize ["modifyvm", :id, "--memory", "1024"]
+  # end
+  #
+  # View the documentation for the provider you're using for more
+  # information on available options.
+
+  # The path to the Berksfile to use with Vagrant Berkshelf
+  # config.berkshelf.berksfile_path = "./Berksfile"
+
+  # Enabling the Berkshelf plugin. To enable this globally, add this configuration
+  # option to your ~/.vagrant.d/Vagrantfile file
+  config.berkshelf.enabled = true
+
+  # An array of symbols representing groups of cookbook described in the Vagrantfile
+  # to exclusively install and copy to Vagrant's shelf.
+  # config.berkshelf.only = []
+
+  # An array of symbols representing groups of cookbook described in the Vagrantfile
+  # to skip installing and copying to Vagrant's shelf.
+  # config.berkshelf.except = []
+
+  config.vm.provision :chef_solo do |chef|
+    chef.json = {
+      mysql: {
+        server_root_password: 'rootpass',
+        server_debian_password: 'debpass',
+        server_repl_password: 'replpass'
+      }
+    }
+
+    chef.run_list = [
+      'recipe[sample_cookbook::default]'
+    ]
+  end
+end

data/spec/invalid/bad_metadata_cookbook/chefignore

@@ -0,0 +1,94 @@
+# Put files/directories that should be ignored in this file when uploading
+# or sharing to the community site.
+# Lines that start with '# ' are comments.
+
+# OS generated files #
+######################
+.DS_Store
+Icon?
+nohup.out
+ehthumbs.db
+Thumbs.db
+
+# SASS #
+########
+.sass-cache
+
+# EDITORS #
+###########
+\#*
+.#*
+*~
+*.sw[a-z]
+*.bak
+REVISION
+TAGS*
+tmtags
+*_flymake.*
+*_flymake
+*.tmproj
+.project
+.settings
+mkmf.log
+
+## COMPILED ##
+##############
+a.out
+*.o
+*.pyc
+*.so
+*.com
+*.class
+*.dll
+*.exe
+*/rdoc/
+
+# Testing #
+###########
+.watchr
+.rspec
+spec/*
+spec/fixtures/*
+test/*
+features/*
+Guardfile
+Procfile
+
+# SCM #
+#######
+.git
+*/.git
+.gitignore
+.gitmodules
+.gitconfig
+.gitattributes
+.svn
+*/.bzr/*
+*/.hg/*
+*/.svn/*
+
+# Berkshelf #
+#############
+cookbooks/*
+tmp
+
+# Cookbooks #
+#############
+CONTRIBUTING
+CHANGELOG*
+
+# Strainer #
+############
+Colanderfile
+Strainerfile
+.colander
+.strainer
+
+# Vagrant #
+###########
+.vagrant
+Vagrantfile
+
+# Travis #
+##########
+.travis.yml

data/spec/invalid/bad_metadata_cookbook/metadata.rb

@@ -0,0 +1,10 @@
+maintainer       'MadGlory'
+maintainer_email 'YOUR_EMAIL'
+license          'All rights reserved'
+description      'Installs/Configures bad_metadata_cookbook'
+long_description 'Installs/Configures bad_metadata_cookbook'
+version          '1.2.3'
+source_url       'https://github.com/electric-it/minimart'
+issues_url       'https://github.com/electric-it/minimart/issues'
+
+depends 'yum', '> 3.0.0'

data/spec/invalid/bad_metadata_cookbook/recipes/default.rb

@@ -0,0 +1,8 @@
+#
+# Cookbook Name:: sample_cookbook
+# Recipe:: default
+#
+# Copyright (C) 2014 YOUR_NAME
+#
+# All rights reserved - Do Not Redistribute
+#

data/spec/lib/minimart/cookbook_spec.rb

@@ -31,6 +31,16 @@ describe Minimart::Cookbook do
     it { is_expected.to eq 'MadGlory' }
   end
 
+  describe '#source_url' do
+    subject { cookbook.source_url }
+    it { is_expected.to eq 'https://github.com/electric-it/minimart'}
+  end
+
+  describe '#issues_url' do
+    subject { cookbook.issues_url }
+    it { is_expected.to eq 'https://github.com/electric-it/minimart/issues'}
+  end
+
   describe '#path' do
     subject { cookbook.path }
     it { is_expected.to eq Pathname.new('spec/fixtures/sample_cookbook') }

data/spec/lib/minimart/mirror/inventory_builder_spec.rb

@@ -197,5 +197,26 @@ describe Minimart::Mirror::InventoryBuilder do
       end
 
     end
+
+    context 'when a cookbook is missing name param in the metadata' do
+      let(:inventory_config) do
+        Minimart::Mirror::InventoryConfiguration.new('spec/fixtures/bad_metadata_inventory.yml')
+      end
+
+      before(:each) do
+        # stub out actually cloning the repo
+        allow_any_instance_of(Minimart::Download::GitRepository).to receive(:fetch).and_yield 'spec/invalid/bad_metadata_cookbook'
+      end
+
+      around(:each) do |e|
+        VCR.use_cassette('location_specific_cookbooks') { e.call }
+      end
+
+      # broken
+      it 'should not include the cookbook in the graph' do
+        subject.build!
+        expect(subject.graph.source_cookbook_added?('bad_metadata_cookbook', '1.2.3')).to eq false
+      end
+    end
   end
 end

data/spec/lib/minimart/web/html_generator_spec.rb

@@ -7,6 +7,9 @@ describe Minimart::Web::HtmlGenerator do
   end
 
   let(:web_directory) { test_directory }
+  let(:assets_directory) { File.join(web_directory, 'assets') }
+  let(:stylesheets_directory) { File.join(assets_directory, 'stylesheets') }
+  let(:javascripts_directory) { File.join(assets_directory, 'javascripts') }
 
   subject do
     Minimart::Web::HtmlGenerator.new(
@@ -17,7 +20,17 @@ describe Minimart::Web::HtmlGenerator do
   describe '#generate' do
     it 'should copy any available assets' do
       subject.generate
-      expect(Dir.exists?(File.join(web_directory, 'assets'))).to eq true
+      expect(Dir.exist?(assets_directory)).to eq true
+    end
+
+    it 'should minify raw CSS files' do
+      subject.generate
+      expect(Dir.entries(stylesheets_directory)).to include('application.min.css')
+    end
+
+    it 'should unglify raw JS files' do
+      subject.generate
+      expect(Dir.entries(javascripts_directory)).to include('application.min.js')
     end
 
     it 'should generate the dashboard page' do
@@ -30,5 +43,4 @@ describe Minimart::Web::HtmlGenerator do
       subject.generate
     end
   end
-
 end

data/web/_assets/stylesheets/main.css

@@ -302,6 +302,12 @@ form {
   width: 100%;
   margin-top: 20px; }
 
+.detail-sidebar__halfbutton {
+  width: 49%;
+  font-size: 14px;
+  margin-top: 20px;
+}
+
 /* Feature blocks */
 .feature-block {
   padding-top: 90px;