minimart 1.0.2 → 1.1.3

data/spec/lib/minimart/cli_spec.rb

@@ -8,7 +8,10 @@ describe Minimart::Cli do
     Dir.chdir(test_directory)
   end
 
-  after(:each) { Dir.chdir(@pwd) }
+  after(:each) do
+    Dir.chdir(@pwd)
+    Minimart::Configuration.load_deps = false
+  end
 
   describe '#init' do
     context 'when a config file option is provided' do
@@ -30,17 +33,19 @@ describe Minimart::Cli do
     it 'should call the mirroring command with the proper options' do
       expect(Minimart::Commands::Mirror).to receive(:new).with(
         'inventory_config'    => './inventory.yml',
-        'inventory_directory' => './inventory').and_return command_double
+        'inventory_directory' => './inventory',
+        "load_deps"=>true).and_return command_double
 
-      Minimart::Cli.start %w[mirror]
+      Minimart::Cli.start %w[mirror --load_deps true]
     end
 
     it 'should allow users to override the default settings' do
       expect(Minimart::Commands::Mirror).to receive(:new).with(
         'inventory_config'    => './my-test.yml',
-        'inventory_directory' => './test-dir').and_return command_double
+        'inventory_directory' => './test-dir',
+        "load_deps"=>true).and_return command_double
 
-      Minimart::Cli.start %w[mirror --inventory_config=./my-test.yml --inventory_directory=./test-dir]
+      Minimart::Cli.start %w[mirror --load_deps true --inventory_config=./my-test.yml --inventory_directory=./test-dir]
     end
 
     context 'when an error is raised' do
@@ -51,7 +56,7 @@ describe Minimart::Cli do
       it 'should handle the error' do
         expect(Minimart::Error).to receive(:handle_exception)
 
-        Minimart::Cli.start %w[mirror --inventory_config=./my-test.yml --inventory_directory=./test-dir]
+        Minimart::Cli.start %w[mirror --load_deps true --inventory_config=./my-test.yml --inventory_directory=./test-dir]
       end
     end
   end

data/spec/lib/minimart/inventory_requirement/git_requirement_spec.rb

@@ -50,7 +50,7 @@ describe Minimart::InventoryRequirement::GitRequirement do
   describe '#requirements' do
     before(:each) { requirement.fetch_cookbook }
     subject { requirement.requirements }
-    it { is_expected.to eq('yum' => '> 3.0.0') }
+    it { is_expected.to_not eq('yum' => '> 3.0.0') }
   end
 
   describe '#matching_source?' do

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

@@ -14,9 +14,6 @@ describe Minimart::Mirror::DependencyGraph do
   end
 
   describe '#add_artifact' do
-    let(:cookbook_dependencies) do
-      subject.find_graph_artifact(cookbook).dependencies.map(&:name)
-    end
 
     before(:each) do
       subject.add_artifact(cookbook)
@@ -26,8 +23,12 @@ describe Minimart::Mirror::DependencyGraph do
       expect(subject.source_cookbook_added?(cookbook.name, cookbook.version)).to eq true
     end
 
-    it 'should add any possible dependencies to the graph' do
-      expect(cookbook_dependencies).to include 'yum'
+    it 'should not have any dependencies' do
+      expect(subject.find_graph_artifact(cookbook).dependencies).to eq []
+    end
+
+    it 'should not add any possible dependencies to the graph' do
+      expect(subject.find_graph_artifact(cookbook).dependencies.map(&:name)).to_not include 'yum'
     end
 
     context 'when the cookbook has already been added' do
@@ -43,12 +44,9 @@ describe Minimart::Mirror::DependencyGraph do
       end
 
       it 'should not add any new dependencies' do
-        expect(cookbook_dependencies).to_not include 'apt'
+        expect(subject.find_graph_artifact(cookbook).dependencies.map(&:name)).to_not include 'apt'
       end
 
-      it 'should leave existing dependencies in place' do
-        expect(cookbook_dependencies).to include 'yum'
-      end
     end
   end
 
@@ -93,16 +91,16 @@ describe Minimart::Mirror::DependencyGraph do
         subject.add_requirement('mysql' => '= 1.0.0')
       end
 
-      it 'should return a resolved mysql version' do
+      it 'should not return a resolved mysql version' do
         expect(subject.resolved_requirements).to include ['mysql', '1.0.0']
       end
 
-      it 'should return a resolved apt version' do
+      it 'should not return a resolved apt version' do
         expect(subject.resolved_requirements).to include ['apt', '2.0.0']
       end
 
-      it 'should return a resolved yum version for the mysql dependency' do
-        expect(subject.resolved_requirements).to include ['yum', '5.0.0']
+      it 'should not return a resolved yum version for the mysql dependency' do
+        expect(subject.resolved_requirements).to_not include ['yum', '5.0.0']
       end
     end
 
@@ -113,10 +111,10 @@ describe Minimart::Mirror::DependencyGraph do
         subject.add_requirement('mysql' => '= 1.0.0')
       end
 
-      it 'should raise an error' do
+      it 'should not raise an error' do
         expect {
           subject.resolved_requirements
-        }.to raise_error Minimart::Error::UnresolvedDependency
+        }.to_not raise_error
       end
     end
   end

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

@@ -21,26 +21,31 @@ describe Minimart::Mirror::InventoryBuilder do
         VCR.use_cassette('location_specific_cookbooks') { e.call }
       end
 
+        # broken
       it 'should add the cookbook to the graph' do
         subject.build!
         expect(subject.graph.source_cookbook_added?('sample_cookbook', '1.2.3')).to eq true
       end
 
+        # broken
       it 'should add the cookbook to the local store' do
         subject.build!
         expect(subject.local_store.installed?('sample_cookbook', '1.2.3')).to eq true
       end
 
-      it 'should add any dependencies of the cookbook to the local store' do
+        # broken
+      it 'should not add any dependencies of the cookbook to the local store' do
         subject.build!
-        expect(subject.local_store.installed?('yum', '3.5.1')).to eq true
+        expect(subject.local_store.installed?('yum', '3.5.1')).to eq false
       end
 
+        # broken
       it 'should clear the git cache' do
         expect_any_instance_of(Minimart::Download::GitCache).to receive :clear
         subject.build!
       end
 
+        # broken
       it 'should store metadata about downloading the cookbook' do
         subject.build!
         metadata = JSON.parse(File.open(File.join(test_directory, 'sample_cookbook-1.2.3', '.minimart.json')).read)
@@ -61,6 +66,7 @@ describe Minimart::Mirror::InventoryBuilder do
             'commitish' => 'SHA')
         end
 
+        # broken
         it 'should raise an error' do
           expect {
             subject.build!
@@ -88,9 +94,9 @@ describe Minimart::Mirror::InventoryBuilder do
         expect(subject.local_store.installed?('sample_cookbook', '1.2.3')).to eq true
       end
 
-      it 'should add any dependencies of the cookbook to the local store' do
+      it 'should not add any dependencies of the cookbook to the local store' do
         subject.build!
-        expect(subject.local_store.installed?('yum', '3.5.1')).to eq true
+        expect(subject.local_store.installed?('yum', '3.5.1')).to eq false
       end
 
       it 'should store metadata about downloading the cookbook' do
@@ -142,16 +148,16 @@ describe Minimart::Mirror::InventoryBuilder do
           expect(Dir.exists?(File.join(test_directory, 'mysql-5.5.4'))).to eq true
         end
 
-        it 'should add any resolved dependencies to the local store' do
+        it 'should not add any resolved dependencies to the local store' do
           subject.build!
-          expect(subject.local_store.installed?('yum', '3.5.1')).to eq true
-          expect(subject.local_store.installed?('yum-mysql-community', '0.1.10')).to eq true
+          expect(subject.local_store.installed?('yum', '3.5.1')).to eq false
+          expect(subject.local_store.installed?('yum-mysql-community', '0.1.10')).to eq false
         end
 
-        it 'should actually add the dependent cookbooks to the local inventory' do
+        it 'should actually not add the dependent cookbooks to the local inventory' do
           subject.build!
-          expect(Dir.exists?(File.join(test_directory, 'yum-3.5.1'))).to eq true
-          expect(Dir.exists?(File.join(test_directory, 'yum-mysql-community-0.1.10'))).to eq true
+          expect(Dir.exists?(File.join(test_directory, 'yum-3.5.1'))).to eq false
+          expect(Dir.exists?(File.join(test_directory, 'yum-mysql-community-0.1.10'))).to eq false
         end
 
         it 'should store metadata about downloading the cookbook' do
@@ -159,7 +165,7 @@ describe Minimart::Mirror::InventoryBuilder do
           metadata = JSON.parse(File.open(File.join(test_directory, 'mysql-5.5.4', '.minimart.json')).read)
           expect(metadata).to include(
             'source_type'    => 'opscode',
-            'location'       => 'https://supermarket.chef.io/api/v1')
+            'location'       => 'https://supermarket.chef.io:443/api/v1')
         end
 
         context 'when a cookbook has already been installed' do

data/spec/spec_helper.rb

@@ -8,6 +8,8 @@ end
 
 begin; require 'pry'; rescue LoadError; end
 
+require 'dotenv'
+Dotenv.load
 require 'rspec'
 require 'vcr'
 require 'webmock/rspec'

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minimart
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.3
 platform: ruby
 authors:
-- Bernie
-- Durfee
+- MadGlory
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-30 00:00:00.000000000 Z
+date: 2015-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git
@@ -17,14 +16,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 1.2.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 1.2.6
 - !ruby/object:Gem::Dependency
   name: minitar
   requirement: !ruby/object:Gem::Requirement
@@ -207,15 +206,29 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.9'
+- !ruby/object:Gem::Dependency
+  name: dotenv
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: MiniMart is a RubyGem that makes it simple to build a repository of Chef
   cookbooks using only static files.
-email:
-- minimart@cobzilla.com
+email: 
 executables:
 - minimart
 extensions: []
 extra_rdoc_files: []
 files:
+- .env.test
 - .gitignore
 - .rspec
 - .travis.yml