richcss 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 366b8fb9be65306620313fa5a8f366121fbb1d85
-  data.tar.gz: dc610a0d85f1d6d086df8560ba4088595730c436
+  metadata.gz: d2b594a7f8664d53a92228767285be2d6cbb17f8
+  data.tar.gz: 342a17212b0b94bc5cc265a615c0b11100318fd3
 SHA512:
-  metadata.gz: 71720c41734a75842e177180cdce7c2fc3cb466fe54db8670497d21f3e37f601aa1b119268d642f9651ac4763d32a040a843627f7a8a6919db414454820401ae
-  data.tar.gz: f2e84138469c33156861866a239f932892f01b3cabb4ddabe930daa019a5be905dae93aae0c5e9e36b0eb81c2d6ae7c19b8997398da89be2d22ab4acde06dd4f
+  metadata.gz: 4cf179c2b1944e3c24d7ea6df4e14ca7d81040a0e4e97c513207e2b4863d3891f172f9b97435116321f692701d738e89941c8ef47b1520231cb87c6f790b26ef
+  data.tar.gz: b888e78e9b47b354bc048bf0d27631bb6bd9b53aed0a49c48fdc03f61139eb15d292bcfc386e6a18641d44fe808c9b6d1cc4e5ca0c5a861df9a5b379e01a81c7

data/lib/richcss/cli.rb

@@ -97,9 +97,15 @@ module RichcssCLI
 
         partfileList = ''
         dep_list = Richcss::Part.resolve_dependencies(part_name, part_version, installed_parts)
-        dep_list.each do |dep|
-          Richcss::Part.fetch(dep.name, dep.version)
-          partfileList << dep.name << " " << dep.version.to_s << "\n"
+
+        if dep_list == nil
+          puts "Failed to install #{part_name} #{part_version}"
+          return
+        end
+
+        dep_list.each do |dep_name, dep_version|
+          Richcss::Part.fetch(dep_name, dep_version)
+          partfileList << dep_name << " " << dep_version.to_s << "\n"
         end
 
         File.open('parts/Partfile', 'wb') do |f|

data/lib/richcss/part.rb

@@ -75,6 +75,7 @@ module Richcss
             when Net::HTTPRedirection then
               location = response['location']
               install(part_name, version, location)
+              return
             else
               puts "Installing part..."
 

data/lib/richcss/resolver.rb

@@ -5,23 +5,29 @@ module Richcss
   class Resolver
 
     def self.start(part_name, version, installed = {})
-      requirements = [VersionKit::Dependency.new(part_name, version)]
+      installed_deps = []
       installed.each do | p, v |
-        requirements.push(VersionKit::Dependency.new(p, v))
+        installed_deps.push(VersionKit::Dependency.new(p, v))
       end
       @resolver = Molinillo::Resolver.new(RichSpecificationProvider.new(part_name, version), RichUI.new)
       @base_dg = Molinillo::DependencyGraph.new
+      installed_deps.each { |dep| @base_dg.add_vertex dep.name, dep }
+      requirements = [VersionKit::Dependency.new(part_name, version)]
       dg = @resolver.resolve(requirements, @base_dg)
-      puts "Succesfully resolved dependencies:\n"
-      dg.map(&:payload).flatten
+      puts "Succesfully resolved dependencies\n"
+      new_deps = dg.map(&:payload).flatten
+      new_deps.each { |dep| installed[dep.name] = dep.version }
+      return installed
     rescue Molinillo::VersionConflict => e
       puts e
+      return nil
     rescue Molinillo::CircularDependencyError => e
       names = e.dependencies.sort_by(&:name).map {|d| "gem '#{d.name}'" }
       puts "Your RichCSS part requires parts that depend" \
         " on each other, creating an circular loop. Please remove" \
         " #{names.count > 1 ? "either " : ""}#{names.join(" or ")}" \
         " and try again."
+      return nil
     end
   end
 end

data/lib/richcss/version.rb

@@ -1,3 +1,3 @@
 module Richcss
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: richcss
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Nicholas Lo, Gabriel Cheng, Bill Xu, Jonathan Lai, David Zhu
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-14 00:00:00.000000000 Z
+date: 2016-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler