dep_selector 0.1.1 → 1.0.0.alpha.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 65eccadd24905931cab90dc78402759be7b5f1eb
-  data.tar.gz: db9220b82552eb1b3796b93f80915b9f7c5a52ef
+  metadata.gz: f5a48552c27513a71e2f314a0cfa5a5c7481f2de
+  data.tar.gz: cd35c4124a5fba219a2d52741869a96782a77a8d
 SHA512:
-  metadata.gz: a99887a3e3e55c8ef559997778697b8f2c97c2b868cad556a9797498693211ff223e166cd1d29c44dc2493734d1aa9476893cf1fade2e01a1dc6e888e482d3e1
-  data.tar.gz: 109afbf133399e1b19c1616dd99f18657c4597c9c91310f0c1ea57e5ebd97948089fd88307c147fba3c688d4130fa2f38c9259d6d1790a7d9629961af88933a3
+  metadata.gz: 5e37053fb8f2176d4f367f483e16990269b2dab226a09b9e6708a4f9643027cc025b00ac0e2c8546482e0f31d07bca35afde31d2d476d82ed7bedc58ae9bb98c
+  data.tar.gz: 882206dd0d935fa751af3132c9114fa67fce40a42167e6ffee4545518962c4fe031dc0b95cab69f8379ace674a90ad3006b3af89b7e66383470e7ec63bbb2f61

data/ext/dep_gecode/dep_selector_swig.i

@@ -39,9 +39,12 @@ int VersionProblemPackageCount(VersionProblem *p);
 int AddPackage(VersionProblem *problem, int min, int max, int currentVersion);
 // Add constraint for package pkg @ version, 
 // that dependentPackage is at version [minDependentVersion,maxDependentVersion]
-// Returns false if system becomes insoluble.
-bool AddVersionConstraint(VersionProblem *problem, int packageId, int version, 
-			  int dependentPackageId, int minDependentVersion, int maxDependentVersion);
+//
+// This used to return a boolean value describing when the problem
+// became insoluble. This was never used, and didn't appear to work
+// at all, and so has been replaced with returning void.
+void AddVersionConstraint(VersionProblem *problem, int packageId, int version,
+                          int dependentPackageId, int minDependentVersion, int maxDependentVersion);
 void MarkPackageSuspicious(VersionProblem *problem, int packageId);
 
 void MarkPackageRequired(VersionProblem *problem, int packageId);

data/ext/dep_gecode/dep_selector_swig_wrap.cxx

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.4
+ * Version 2.0.9
  * 
  * This file is not intended to be easily readable and contains a number of 
  * coding conventions designed to improve portability and efficiency. Do not make
@@ -1398,7 +1398,7 @@ SWIG_Ruby_AppendOutput(VALUE target, VALUE o) {
 
 /* Runtime API */
 
-#define SWIG_GetModule(clientdata)                      SWIG_Ruby_GetModule()	
+#define SWIG_GetModule(clientdata)                      SWIG_Ruby_GetModule(clientdata)
 #define SWIG_SetModule(clientdata, pointer) 		SWIG_Ruby_SetModule(pointer)
 
 
@@ -1552,7 +1552,7 @@ SWIG_Ruby_NewPointerObj(void *ptr, swig_type_info *type, int flags)
         downcast methods. */
       if (obj != Qnil) {
         VALUE value = rb_iv_get(obj, "@__swigtype__");
-        char* type_name = RSTRING_PTR(value);
+        const char* type_name = RSTRING_PTR(value);
 				
         if (strcmp(type->name, type_name) == 0) {
           return obj;
@@ -1734,7 +1734,7 @@ SWIG_Ruby_ConvertPacked(VALUE obj, void *ptr, int sz, swig_type_info *ty) {
 }
 
 SWIGRUNTIME swig_module_info *
-SWIG_Ruby_GetModule(void)
+SWIG_Ruby_GetModule(void *SWIGUNUSEDPARM(clientdata))
 {
   VALUE pointer;
   swig_module_info *ret = 0;
@@ -1831,7 +1831,7 @@ static VALUE mDep_gecode;
 #define SWIG_RUBY_THREAD_END_BLOCK
 
 
-#define SWIGVERSION 0x020004 
+#define SWIGVERSION 0x020009 
 #define SWIG_VERSION SWIGVERSION
 
 
@@ -1862,7 +1862,7 @@ SWIG_ruby_failed(void)
 } 
 
 
-/*@SWIG:/usr/local/Cellar/swig/2.0.4/share/swig/2.0.4/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/usr/local/Cellar/swig/2.0.9/share/swig/2.0.9/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2LONG(VALUE *args)
 {
   VALUE obj = args[0];
@@ -1944,11 +1944,7 @@ SWIGINTERN int
 SWIG_AsCharPtrAndSize(VALUE obj, char** cptr, size_t* psize, int *alloc)
 {
   if (TYPE(obj) == T_STRING) {
-    #if defined(StringValuePtr)
     char *cstr = StringValuePtr(obj); 
-    #else
-    char *cstr = STR2CSTR(obj);
-    #endif
     size_t size = RSTRING_LEN(obj) + 1;
     if (cptr)  {
       if (alloc) {
@@ -2185,8 +2181,6 @@ _wrap_AddVersionConstraint(int argc, VALUE *argv, VALUE self) {
   int ecode5 = 0 ;
   int val6 ;
   int ecode6 = 0 ;
-  bool result;
-  VALUE vresult = Qnil;
   
   if ((argc < 6) || (argc > 6)) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 6)",argc); SWIG_fail;
@@ -2221,9 +2215,8 @@ _wrap_AddVersionConstraint(int argc, VALUE *argv, VALUE self) {
     SWIG_exception_fail(SWIG_ArgError(ecode6), Ruby_Format_TypeError( "", "int","AddVersionConstraint", 6, argv[5] ));
   } 
   arg6 = static_cast< int >(val6);
-  result = (bool)AddVersionConstraint(arg1,arg2,arg3,arg4,arg5,arg6);
-  vresult = SWIG_From_bool(static_cast< bool >(result));
-  return vresult;
+  AddVersionConstraint(arg1,arg2,arg3,arg4,arg5,arg6);
+  return Qnil;
 fail:
   return Qnil;
 }
@@ -2631,8 +2624,6 @@ SWIG_InitializeModule(void *clientdata) {
   swig_module_info *module_head, *iter;
   int found, init;
 
-  clientdata = clientdata;
-
   /* check to see if the circular list has been setup, if not, set it up */
   if (swig_module.next==0) {
     /* Initialize the swig_module */

data/ext/dep_gecode/dep_selector_to_gecode.cpp

@@ -222,7 +222,7 @@ VersionProblem::AddPackage(int minVersion, int maxVersion, int currentVersion)
     return index;
 }
 
-bool
+void
 VersionProblem::AddVersionConstraint(int packageId, int version,
                                      int dependentPackageId, int minDependentVersion, int maxDependentVersion)
 {
@@ -255,6 +255,10 @@ VersionProblem::AddVersionConstraint(int packageId, int version,
 
     rel(*this, disabled_package_variables[dependentPackageId], BOT_OR, depend_match, predicated_depend_match);
     rel(*this, version_match, BOT_IMP, predicated_depend_match, 1);
+
+    // This used to return a boolean value describing when the problem
+    // became insoluble. This was never used, and didn't appear to work
+    // at all, and so has been replaced with returning void.
 }
 
 void
@@ -500,23 +504,23 @@ void VersionProblem::BuildCostVector(IntVarArgs & costVector) const {
 
 
 
-IntVar & VersionProblem::GetPackageVersionVar(int packageId)
+IntVar * VersionProblem::GetPackageVersionVar(int packageId)
 {
     if (packageId < cur_package) {
-        return package_versions[packageId];
+        return &package_versions[packageId];
     } else {
         if (debugLogging) {
             DEBUG_STREAM << debugPrefix << "Bad package Id " << packageId << " >= " << cur_package << std::endl;
             DEBUG_STREAM.flush();
         }
-        //     return 0;
+        return NULL;
     }
 }
 
 int VersionProblem::GetPackageVersion(int packageId)
 {
-    IntVar & var = GetPackageVersionVar(packageId);
-    if (1 == var.size()) return var.val();
+    IntVar *var = GetPackageVersionVar(packageId);
+    if (1 == var->size()) return var->val();
     return UNRESOLVED_VARIABLE;
 }
 bool VersionProblem::GetPackageDisabledState(int packageId)
@@ -526,11 +530,11 @@ bool VersionProblem::GetPackageDisabledState(int packageId)
 
 int VersionProblem::GetMax(int packageId)
 {
-    return GetPackageVersionVar(packageId).max();
+    return GetPackageVersionVar(packageId)->max();
 }
 int VersionProblem::GetMin(int packageId)
 {
-    return GetPackageVersionVar(packageId).min();
+    return GetPackageVersionVar(packageId)->min();
 }
 
 int VersionProblem::GetDisabledVariableCount()
@@ -567,8 +571,8 @@ void VersionProblem::Print(std::ostream & out)
 
 void VersionProblem::PrintPackageVar(std::ostream & out, int packageId)
 {
-    IntVar & var = GetPackageVersionVar(packageId);
-    out << "PackageId: " << packageId <<  " Sltn: " << var << " disabled: " << disabled_package_variables[packageId] << " at latest: " << at_latest[packageId];
+    IntVar *var = GetPackageVersionVar(packageId);
+    out << "PackageId: " << packageId <<  " Sltn: " << *var << " disabled: " << disabled_package_variables[packageId] << " at latest: " << at_latest[packageId];
 }
 
 bool VersionProblem::CheckPackageId(int id)

data/ext/dep_gecode/dep_selector_to_gecode.h

@@ -75,11 +75,11 @@ public:
   int Size();
   int PackageCount();
 
-  IntVar & GetPackageVersionVar(int packageId);
+  IntVar * GetPackageVersionVar(int packageId);
 
   virtual int AddPackage(int minVersion, int maxVersion, int currentVersion);
 
-  virtual bool AddVersionConstraint(int packageId, int version, 
+  virtual void AddVersionConstraint(int packageId, int version,
 			    int dependentPackageId, int minDependentVersion, int maxDependentVersion);
 
   // We may wish to indicate that some packages have suspicious constraints, and when chosing packages to disable we 

data/ext/dep_gecode/dep_selector_to_gecode_interface.cpp

@@ -32,7 +32,7 @@
 VersionProblem * VersionProblemCreate(int packageCount, bool dump_stats,
                                       bool debug, const char * logId) 
 {
-    return new VersionProblem(packageCount, dump_stats, debug, logId);
+  return new VersionProblem(packageCount, dump_stats, debug, logId);
 }
 
 void VersionProblemDestroy(VersionProblem * p)
@@ -66,55 +66,55 @@ void VersionProblemPrintPackageVar(VersionProblem *p, int packageId)
 
 // Return ID #
 int AddPackage(VersionProblem *problem, int min, int max, int currentVersion) {
-  problem->AddPackage(min,max,currentVersion);
+  return problem->AddPackage(min,max,currentVersion);
 }
 // Add constraint for package pkg @ version, 
 // that dependentPackage is at version [minDependentVersion,maxDependentVersion]
 // Returns false if system becomes insoluble.
-bool AddVersionConstraint(VersionProblem *problem, int packageId, int version, 
+void AddVersionConstraint(VersionProblem *problem, int packageId, int version,
 			  int dependentPackageId, int minDependentVersion, int maxDependentVersion) 
 {
-  problem->AddVersionConstraint(packageId, version, dependentPackageId, minDependentVersion, maxDependentVersion);
+  return problem->AddVersionConstraint(packageId, version, dependentPackageId, minDependentVersion, maxDependentVersion);
 }
 
 void MarkPackageSuspicious(VersionProblem *problem, int packageId) 
 {
-  problem->MarkPackageSuspicious(packageId);
+  return problem->MarkPackageSuspicious(packageId);
 }
 
 void MarkPackagePreferredToBeAtLatest(VersionProblem *problem, int packageId, int weight)
 {
-  problem->MarkPackagePreferredToBeAtLatest(packageId, weight);
+  return problem->MarkPackagePreferredToBeAtLatest(packageId, weight);
 }
 
 void MarkPackageRequired(VersionProblem *problem, int packageId)
 {
-  problem->MarkPackageRequired(packageId);
+  return problem->MarkPackageRequired(packageId);
 }
 
 int GetPackageVersion(VersionProblem *problem, int packageId)
 {
-  problem->GetPackageVersion(packageId);
+  return problem->GetPackageVersion(packageId);
 }
 
 bool GetPackageDisabledState(VersionProblem *problem, int packageId)
 {
-  problem->GetPackageDisabledState(packageId);
+  return problem->GetPackageDisabledState(packageId);
 }
 
 int GetPackageMax(VersionProblem *problem, int packageId)
 {
-  problem->GetMax(packageId);
+  return problem->GetMax(packageId);
 }
 
 int GetPackageMin(VersionProblem *problem, int packageId)
 {
-  problem->GetMin(packageId);
+  return problem->GetMin(packageId);
 }
 
 int GetDisabledVariableCount(VersionProblem *problem)
 {
-  problem->GetDisabledVariableCount();
+  return problem->GetDisabledVariableCount();
 }
 
 

data/ext/dep_gecode/dep_selector_to_gecode_interface.h

@@ -44,7 +44,7 @@ extern "C" {
   // Add constraint for package pkg @ version, 
   // that dependentPackage is at version [minDependentVersion,maxDependentVersion]
   // Returns false if system becomes insoluble.
-  bool AddVersionConstraint(VersionProblem *problem, int packageId, int version, 
+  void AddVersionConstraint(VersionProblem *problem, int packageId, int version,
 			    int dependentPackageId, int minDependentVersion, int maxDependentVersion);
 
   void MarkPackageSuspicious(VersionProblem *problem, int packageId);

data/lib/dep_selector/dep_selector_version.rb

@@ -1,3 +1,3 @@
 module DepSelector
-  VERSION = "0.1.1"
+  VERSION = "1.0.0.alpha.0"
 end

data/lib/dep_selector/gecode_wrapper.rb

@@ -17,25 +17,45 @@
 # limitations under the License.
 #
 
-require "uuidtools"
-require "dep_gecode"
+require 'securerandom'
 require 'dep_selector/exceptions'
 
+begin
+  require "dep_gecode"
+rescue LoadError
+  warn("Unable to find shared object `dep_gecode' in load path")
+  path = File.expand_path("../../../ext/dep_gecode", __FILE__)
+  warn("Adding ext directory `#{path}' to load path to find development extensions.")
+  $:.unshift(path)
+  require "dep_gecode"
+end
+
 module DepSelector
+
+  @dump_statistics = false
+
+  def self.dump_statistics
+    @dump_statistics
+  end
+
+  def self.dump_statistics=(dump_statistics)
+    @dump_statistics = dump_statistics
+  end
+
   class GecodeWrapper
     attr_reader :gecode_problem
     attr_reader :debug_logs_on
     DontCareConstraint = -1
     NoMatchConstraint = -2
-    DumpStatistics = true
-    
+
     # This insures that we properly deallocate the c++ class at the heart of dep_gecode.
     # modeled after http://www.mikeperham.com/2010/02/24/the-trouble-with-ruby-finalizers/
     def initialize(problem_or_package_count, debug=false)
       if (problem_or_package_count.is_a?(Numeric))
-        logId = UUIDTools::UUID.random_create().to_str()
+        logId = SecureRandom.uuid
+        dump_statistics = DepSelector.dump_statistics || debug
         @debug_logs_on = debug
-        @gecode_problem = Dep_gecode.VersionProblemCreate(problem_or_package_count, DumpStatistics, debug, logId)
+        @gecode_problem = Dep_gecode.VersionProblemCreate(problem_or_package_count, dump_statistics, debug, logId)
       else
         @gecode_problem = problem_or_package_count
       end
@@ -46,9 +66,9 @@ module DepSelector
     end
 
     def check_package_id(package_id, param_name)
-      raise "Gecode #{param_name} is out of range #{package_id}" unless (package_id >= 0 && package_id < self.size()) 
+      raise "Gecode #{param_name} is out of range #{package_id}" unless (package_id >= 0 && package_id < self.size())
     end
-    
+
     def size()
       raise "Gecode internal failure" if gecode_problem.nil?
       Dep_gecode.VersionProblemSize(gecode_problem)
@@ -105,18 +125,18 @@ module DepSelector
       check_package_id(package_id, "package_id")
       Dep_gecode.GetPackageDisabledState(gecode_problem, package_id);
     end
-    
-    def get_package_max(package_id) 
+
+    def get_package_max(package_id)
       raise "Gecode internal failure" if gecode_problem.nil?
       check_package_id(package_id, "package_id")
       Dep_gecode.GetPackageMax(gecode_problem, package_id)
     end
-    def get_package_min(package_id) 
+    def get_package_min(package_id)
       raise "Gecode internal failure" if gecode_problem.nil?
       check_package_id(package_id, "package_id")
       Dep_gecode.GetPackageMin(gecode_problem, package_id)
     end
-    def dump() 
+    def dump()
       raise "Gecode internal failure" if gecode_problem.nil?
       Dep_gecode.VersionProblemDump(gecode_problem)
     end

data/lib/dep_selector/package.rb

@@ -49,7 +49,7 @@ module DepSelector
       # version constraints must abide the include? contract
       if version_or_constraint.respond_to?(:include?)
         versions.select do |ver|
-          version_or_constraint.include?(ver)
+          version_or_constraint.include?(ver.version)
         end
       else
         versions.find{|pkg_version| pkg_version.version == version_or_constraint}

data/lib/dep_selector/selector.rb

@@ -67,7 +67,7 @@ module DepSelector
       packages_to_include_in_solve = trim_unreachable_packages(dep_graph, solution_constraints)
 
       begin
-        Timeout::timeout(@time_bound, Exceptions::TimeBoundExceeded) do 
+        Timeout::timeout(@time_bound, Exceptions::TimeBoundExceeded) do
           # first, try to solve the whole set of constraints
           solve(dep_graph.clone, solution_constraints, valid_packages, packages_to_include_in_solve)
         end
@@ -109,7 +109,7 @@ module DepSelector
                   end
                 disabled_collection << disabled_pkg
               end
-              
+
               # Pick the first non-existent or most-constrained package
               # that was required or the package whose constraints had
               # to be disabled in order to find a solution and generate
@@ -122,7 +122,7 @@ module DepSelector
                 disabled_most_constrained_packages.first
               feedback = error_reporter.give_feedback(dep_graph, solution_constraints, idx,
                                                       disabled_package_to_report_on)
-              
+
               raise Exceptions::NoSolutionExists.new(feedback, solution_constraints[idx],
                                                      disabled_non_existent_packages,
                                                      disabled_most_constrained_packages)
@@ -147,7 +147,7 @@ module DepSelector
       # validate solution_constraints and generate its constraints
       process_soln_constraints(workspace, solution_constraints, valid_packages)
 
-      # solve and trim the solution down to only the 
+      # solve and trim the solution down to only the
       soln = workspace.gecode_wrapper.solve
       trim_solution(solution_constraints, soln, workspace)
     end
@@ -162,7 +162,7 @@ module DepSelector
 
       soln_constraints_on_non_existent_packages = []
       soln_constraints_that_match_no_versions = []
-      
+
       # generate constraints imposed by solution_constraints
       solution_constraints.each do |soln_constraint|
         # look up the package in the cloned dep_graph that corresponds to soln_constraint
@@ -182,6 +182,7 @@ module DepSelector
         end
 
         pkg_id = pkg.gecode_package_id
+
         gecode.mark_preferred_to_be_at_latest(pkg_id, 10)
         gecode.mark_required(pkg_id)
 
@@ -203,11 +204,13 @@ module DepSelector
     end
 
     # Given an assignment of versions to packages, filter down to only
-    # the required assignments 
+    # the required assignments
     def trim_solution(soln_constraints, soln, workspace)
       trimmed_soln = {}
+
       soln_constraints.each do |soln_constraint|
         package = workspace.package(soln_constraint.package.name)
+
         expand_package(trimmed_soln, package, soln)
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dep_selector
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 1.0.0.alpha.0
 platform: ruby
 authors:
 - Christopher Walters
@@ -9,55 +9,54 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-18 00:00:00.000000000 Z
+date: 2014-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: uuidtools
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.14'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: 0.9.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: 0.9.2
 - !ruby/object:Gem::Dependency
-  name: rake-compiler
+  name: solve
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: '0.8'
 description: Given packages, versions, and a dependency graph, find a valid assignment
   of package versions
 email:
-- cw@opscode.com
-- mark@opscode.com
+- dev@getchef.com
 executables: []
 extensions:
 - ext/dep_gecode/extconf.rb
@@ -86,7 +85,7 @@ files:
 - ext/dep_gecode/dep_selector_to_gecode_interface.cpp
 - ext/dep_gecode/extconf.rb
 - ext/dep_gecode/lib/dep_selector_to_gecode.rb
-homepage: http://github.com/algorist/dep_selector
+homepage: http://github.com/opscode/dep-selector
 licenses:
 - Apache v2
 metadata: {}
@@ -98,12 +97,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements:
 - gecode, version 3.5 or greater
 - g++