dep_selector 1.0.0.alpha.0 → 1.0.0.alpha.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f5a48552c27513a71e2f314a0cfa5a5c7481f2de
-  data.tar.gz: cd35c4124a5fba219a2d52741869a96782a77a8d
+  metadata.gz: eedf57363ca865a2274f202af0d5c2744d107f0e
+  data.tar.gz: 8b0012e3789d25b4ebca6abdadf95937ab8a7f2f
 SHA512:
-  metadata.gz: 5e37053fb8f2176d4f367f483e16990269b2dab226a09b9e6708a4f9643027cc025b00ac0e2c8546482e0f31d07bca35afde31d2d476d82ed7bedc58ae9bb98c
-  data.tar.gz: 882206dd0d935fa751af3132c9114fa67fce40a42167e6ffee4545518962c4fe031dc0b95cab69f8379ace674a90ad3006b3af89b7e66383470e7ec63bbb2f61
+  metadata.gz: cd94581cafdd7dc198c84fe25cf21eb5de8112d4f24ed767ef326ddc996d1e61f1bc68eda06f11ed9a872855328c95822e890a0eb0208a55d08052d1fd9c76a6
+  data.tar.gz: a2e9623c53220191aedcbb01ba33a3efe27f1ee5cb7728634172fe7c60393ffa49fdd9905dbd00706e14cf4dd4adff248f9855314e0879ae3ce952528470d1e2

data/ext/dep_gecode/extconf.rb

@@ -17,43 +17,45 @@
 # limitations under the License.
 #
 
-#
-# GECODE needs to be built with 
-# ./configure --with-architectures=i386,x86_64
-# to work properly here.
-require 'mkmf'
-
-# $CFLAGS << "-g"
-
-gecode_installed =
-  # Gecode documentation notes:
-  # "Some linkers require the list of libraries to be sorted such that
-  # libraries appear before all libraries they depend on."
-  # http://www.gecode.org/doc-latest/MPG.pdf
-  #
-  # This appears to be true of the version of mingw that ships with Ruby 1.9.3.
-  # The correct order of `-l` flags according to the docs is:
-  #
-  # 1. -lgecodeflatzinc
-  # 2. -lgecodedriver
-  # 3. -lgecodegist
-  # 4. -lgecodesearch,
-  # 5. -lgecodeminimodel
-  # 6. -lgecodeset
-  # 7. -lgecodefloat
-  # 8. -lgecodeint
-  # 9. -lgecodekernel
-  # 10. -lgecodesupport
+# Ruby that supports C extensions. Our library isn't an extension, but we piggyback on ruby's C extension build system
+if !defined?(RUBY_ENGINE) || RUBY_ENGINE == 'ruby' || RUBY_ENGINE == 'rbx'
   #
-  # Ruby `mkmf` will add `-l` flags in the _REVERSE_ order that they appear here.
-  have_library('gecodesupport') &&
-  have_library('gecodekernel') &&
-  have_library('gecodeint') &&
-  have_library('gecodeminimodel') &&
-  have_library('gecodesearch')
-
-unless gecode_installed
-  STDERR.puts <<EOS
+  # GECODE needs to be built with 
+  # ./configure --with-architectures=i386,x86_64
+  # to work properly here.
+  require 'mkmf'
+
+  # $CFLAGS << "-g"
+
+  gecode_installed =
+    # Gecode documentation notes:
+    # "Some linkers require the list of libraries to be sorted such that
+    # libraries appear before all libraries they depend on."
+    # http://www.gecode.org/doc-latest/MPG.pdf
+    #
+    # This appears to be true of the version of mingw that ships with Ruby 1.9.3.
+    # The correct order of `-l` flags according to the docs is:
+    #
+    # 1. -lgecodeflatzinc
+    # 2. -lgecodedriver
+    # 3. -lgecodegist
+    # 4. -lgecodesearch,
+    # 5. -lgecodeminimodel
+    # 6. -lgecodeset
+    # 7. -lgecodefloat
+    # 8. -lgecodeint
+    # 9. -lgecodekernel
+    # 10. -lgecodesupport
+    #
+    # Ruby `mkmf` will add `-l` flags in the _REVERSE_ order that they appear here.
+    have_library('gecodesupport') &&
+    have_library('gecodekernel') &&
+    have_library('gecodeint') &&
+    have_library('gecodeminimodel') &&
+    have_library('gecodesearch')
+
+  unless gecode_installed
+    STDERR.puts <<EOS
 =========================================================================================
 Gecode >3.5 must be installed (http://www.gecode.org/).
 
@@ -72,7 +74,128 @@ For convenience, we have built Gecode for Debian/Ubuntu (<release> is lucid or m
 Other distributions can build from source.
 =========================================================================================
 EOS
-  raise "Gecode not installed"
-end
+    raise "Gecode not installed"
+  end
+
+  create_makefile('dep_gecode')
+else # JRUBY
+
+  require 'rbconfig'
+  require 'ffi/platform'
+
+  cflags = ENV['CFLAGS']
+  cppflags = ENV['CPPFLAGS']
+  cxxflags = ENV['CXXFLAGS']
+  ldflags = ENV['LDFLAGS']
+  cc = ENV['CC']
+  cxx = ENV['CXX']
+
+  ldsharedxx = RbConfig::MAKEFILE_CONFIG["LDSHAREDXX"]
+
+  # use the CC that ruby was compiled with by default
+  cc ||= RbConfig::MAKEFILE_CONFIG['CC']
+  cxx  ||= RbConfig::MAKEFILE_CONFIG["CXX"]
+  cppflags ||= RbConfig::MAKEFILE_CONFIG["CPPFLAGS"]
+  cxxflags ||= RbConfig::MAKEFILE_CONFIG["CXXFLAGS"]
+  cflags ||= ""
+  ldflags ||= ""
+
+  # then ultimately default back to gcc
+  cc ||= "gcc"
+  cxx ||= "g++"
+
+  # JRuby reports that the compiler is "CC" no matter what, so we can't detect
+  # if we're using anything other than gcc/llvm. Therefore we just assume
+  # that's the compiler we're on.
+  cflags << "-Wno-error=shorten-64-to-32  -pipe"
+  cflags << " -O3" unless cflags =~ /-O\d/
+  cflags << " -Wall -fPIC"
+  cppflags << " -O3" unless cppflags =~ /-O\d/
+  cppflags << " -fno-common -fPIC"
+  cxxflags << " -O3" unless cppflags =~ /-O\d/
+  cxxflags << " -fno-common -fPIC"
+
+  ENV['CFLAGS'] = cflags
+  ENV['LDFLAGS'] = ldflags
+  ENV['CC'] = cc
+  ENV['CXX'] = cxx
+  ENV["CPPFLAGS"] = cppflags
+  ENV["CXXFLAGS"] = cxxflags
+
+  dlext = FFI::Platform::LIBSUFFIX
+
+  headers = "$(srcdir)/dep_selector_to_gecode.h $(srcdir)/dep_selector_to_gecode_interface.h"
+
+  install = RbConfig::MAKEFILE_CONFIG["INSTALL"]
 
-create_makefile('dep_gecode')
+  File.open("Makefile", "w") do |mf|
+    mf.puts(<<-EOH)
+# Makefile for building dep_gecode
+
+# V=0 quiet, V=1 verbose.  other values don't work.
+V = 1
+Q1 = $(V:1=)
+Q = $(Q1:0=@)
+ECHO1 = $(V:1=@:)
+ECHO = $(ECHO1:0=@echo)
+
+srcdir = .
+
+CFLAGS = #{ENV['CFLAGS']}
+LDFLAGS = #{ENV['LDFLAGS']}
+CPPFLAGS = #{ENV['CPPFLAGS']}
+CXXFLAGS = #{ENV['CXXFLAGS']}
+INCFLAGS = -I.
+LDSHAREDXX = #{ldsharedxx}
+
+empty =
+OUTFLAG = -o $(empty)
+COUTFLAG = -o $(empty)
+CC = #{ENV['CC']}
+CXX = #{ENV["CXX"]}
+TARGET = dep_gecode
+TARGET_NAME = dep_gecode
+DLLIB = $(TARGET).#{dlext}
+LIBS = -lgecodesearch -lgecodeminimodel -lgecodeint -lgecodekernel -lgecodesupport
+CLEANLIBS = $(DLLIB)
+OBJS = dep_selector_to_gecode.o dep_selector_to_gecode_interface.o
+CLEANOBJS = *.o  *.bak
+HDRS = #{headers}
+
+INSTALL = #{install}
+INSTALL_PROG = $(INSTALL) -m 0755
+INSTALL_DATA = $(INSTALL) -m 644
+
+all:\t$(DLLIB)
+
+install:
+
+clean:
+\t$(Q)$(RM) $(CLEANLIBS) $(CLEANOBJS) $(CLEANFILES) .*.time
+
+
+.SUFFIXES: .c .m .cc .mm .cxx .cpp .C .o
+
+.cc.o:
+	$(ECHO) compiling $(<)
+	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
+
+.cxx.o:
+	$(ECHO) compiling $(<)
+	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
+
+.cpp.o:
+	$(ECHO) compiling $(<)
+	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
+
+$(DLLIB): $(OBJS) Makefile
+	$(ECHO) linking shared-object $(DLLIB)
+	-$(Q)$(RM) $(@)
+	$(Q) $(LDSHAREDXX) -o $@ $(OBJS) $(LIBPATH) $(DLDFLAGS) $(LOCAL_LIBS) $(LIBS)
+	$(Q) test -z '$(RUBY_CODESIGN)' || codesign -s '$(RUBY_CODESIGN)' -f $@
+
+$(OBJS): $(HDRS)
+
+EOH
+  end
+end

data/lib/dep_selector/dep_gecode.rb

@@ -0,0 +1,83 @@
+#
+# Author:: Daniel DeLeo (<dan@getchef.com>)
+# Copyright:: Copyright (c) 2014 Chef Software, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'ffi'
+
+module Dep_gecode
+
+  extend FFI::Library
+
+  lib_dir = File.expand_path("../../", __FILE__)
+  lib_dir_path = Dir["#{lib_dir}/dep_gecode.*"].first
+
+  ext_dir = File.expand_path("../../../ext/dep_gecode/", __FILE__)
+  ext_dir_path = Dir["#{ext_dir}/dep_gecode.*"].first
+
+  path = lib_dir_path || ext_dir_path
+
+  ffi_lib path
+
+  # VersionProblem * VersionProblemCreate(int packageCount, bool dumpStats, 
+  #                                       bool debug, const char * log_id);
+  attach_function :VersionProblemCreate, [:int, :bool, :bool, :string], :pointer
+
+  # void VersionProblemDestroy(VersionProblem * vp);
+  attach_function :VersionProblemDestroy, [:pointer], :void
+
+  # int AddPackage(VersionProblem *problem, int min, int max, int currentVersion);
+  attach_function :AddPackage, [:pointer, :int, :int, :int], :int
+
+  # int VersionProblemSize(VersionProblem *p); 
+  attach_function :VersionProblemSize, [:pointer], :int
+
+  # void MarkPackagePreferredToBeAtLatest(VersionProblem *problem, int packageId, int weight);
+  attach_function :MarkPackagePreferredToBeAtLatest, [:pointer, :int, :int], :void
+
+  # void MarkPackageRequired(VersionProblem *problem, int packageId);
+  attach_function :MarkPackageRequired, [:pointer, :int], :void
+
+  # void AddVersionConstraint(VersionProblem *problem, int packageId, int version,
+  #                           int dependentPackageId, int minDependentVersion, int maxDependentVersion);
+  attach_function :AddVersionConstraint, [:pointer, :int, :int, :int, :int, :int], :void
+
+  # VersionProblem * Solve(VersionProblem * problem);
+  attach_function :Solve, [:pointer], :pointer
+
+  # int GetDisabledVariableCount(VersionProblem *problem);
+  attach_function :GetDisabledVariableCount, [:pointer], :int
+
+  # int GetPackageVersion(VersionProblem *problem, int packageId);
+  attach_function :GetPackageVersion, [:pointer, :int], :int
+
+  # void MarkPackageSuspicious(VersionProblem *problem, int packageId);
+  attach_function :MarkPackageSuspicious, [:pointer, :int], :void
+
+  # bool GetPackageDisabledState(VersionProblem *problem, int packageId);
+  attach_function :GetPackageDisabledState, [:pointer, :int], :bool
+
+  # int VersionProblemPackageCount(VersionProblem *p);
+  attach_function :VersionProblemPackageCount, [:pointer], :int
+
+  # int GetPackageMax(VersionProblem *problem, int packageId);
+  attach_function :GetPackageMax, [:pointer, :int], :int
+
+  # int GetPackageMin(VersionProblem *problem, int packageId);
+  attach_function :GetPackageMin, [:pointer, :int], :int
+end
+
+

data/lib/dep_selector/dep_selector_version.rb

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

data/lib/dep_selector/dependency_graph.rb

@@ -77,10 +77,26 @@ module DepSelector
       packages.keys.sort.map{|name| packages[name].to_s(incl_densely_packed_versions)}.join("\n")
     end
 
-    # TODO [cw,2010/11/23]: this is a simple but inefficient impl. Do
-    # it for realz.
+    # Does a mostly deep copy of this graph, creating new Package,
+    # PackageVersion, and Dependency objects in the copy graph. Version and
+    # VersionConstraint objects are re-used from the existing graph.
     def clone
-      Marshal.load(Marshal.dump(self))
+      copy = self.class.new
+      @packages.each do |name, package|
+        copy_package = copy.package(name)
+
+        package.versions.each do |package_version|
+          copy_pkg_version = copy_package.add_version(package_version.version)
+          package_version.dependencies.each do |pkg_vers_dep|
+            dep_pkg_name = pkg_vers_dep.package.name
+            copy_dependency = DepSelector::Dependency.new(copy.package(dep_pkg_name), pkg_vers_dep.constraint)
+            copy_pkg_version.dependencies << copy_dependency
+          end
+        end
+      end
+      copy
     end
+
+
   end
 end

data/lib/dep_selector/gecode_wrapper.rb

@@ -18,18 +18,9 @@
 #
 
 require 'securerandom'
+require 'dep_selector/dep_gecode'
 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
@@ -43,6 +34,7 @@ module DepSelector
   end
 
   class GecodeWrapper
+
     attr_reader :gecode_problem
     attr_reader :debug_logs_on
     DontCareConstraint = -1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dep_selector
 version: !ruby/object:Gem::Version
-  version: 1.0.0.alpha.0
+  version: 1.0.0.alpha.1
 platform: ruby
 authors:
 - Christopher Walters
@@ -9,36 +9,50 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-02 00:00:00.000000000 Z
+date: 2014-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: ffi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '1.9'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.9'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: rake-compiler
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: '2.14'
 - !ruby/object:Gem::Dependency
   name: solve
   requirement: !ruby/object:Gem::Requirement
@@ -63,6 +77,7 @@ extensions:
 extra_rdoc_files: []
 files:
 - lib/dep_selector/densely_packed_set.rb
+- lib/dep_selector/dep_gecode.rb
 - lib/dep_selector/dep_selector_version.rb
 - lib/dep_selector/dependency.rb
 - lib/dep_selector/dependency_graph.rb
@@ -78,13 +93,11 @@ files:
 - lib/dep_selector/version_constraint.rb
 - lib/dep_selector.rb
 - ext/dep_gecode/dep_selector_swig.i
-- ext/dep_gecode/dep_selector_swig_wrap.cxx
 - ext/dep_gecode/dep_selector_to_gecode.h
 - ext/dep_gecode/dep_selector_to_gecode_interface.h
 - ext/dep_gecode/dep_selector_to_gecode.cpp
 - 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/opscode/dep-selector
 licenses:
 - Apache v2