autoproj 2.3.1 → 2.4.0

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "2.3.1"
+    VERSION = "2.4.0"
 end

data/lib/autoproj/workspace.rb

@@ -701,6 +701,44 @@ def register_package(package, block = nil, package_set = manifest.main_package_s
             pkg.autobuild.ws = self
             pkg
         end
+
+        class ExecutableNotFound < ArgumentError
+        end
+
+        # Find the given executable file in PATH
+        #
+        # If `cmd` is an absolute path, it will either return it or raise if
+        # `cmd` is not executable. Otherwise, looks for an executable named
+        # `cmd` in PATH and returns it, or raises if it cannot be found. The
+        # exception contains a more detailed reason for failure
+        # 
+        #
+        # @param [String] cmd
+        # @return [String] the resolved program
+        # @raise [ExecutableNotFound] if an executable file named `cmd` cannot
+        #   be found
+        def which(cmd)
+            path = Pathname.new(cmd)
+            if path.absolute?
+                if path.file? && path.executable?
+                    return cmd
+                elsif path.exist?
+                    raise ExecutableNotFound.new(cmd), "given command `#{cmd}` exists but is not an executable file"
+                else
+                    raise ExecutableNotFound.new(cmd), "given command `#{cmd}` does not exist, an executable file was expected"
+                end
+            else
+                env = full_env
+                absolute = env.find_executable_in_path(cmd)
+                if absolute
+                    return absolute
+                elsif file = env.find_in_path(cmd)
+                    raise ExecutableNotFound.new(cmd), "`#{cmd}` resolves to #{file} which is not executable"
+                else
+                    raise ExecutableNotFound.new(cmd), "cannot resolve `#{cmd}` to an executable in the workspace"
+                end
+            end
+        end
     end
 
     def self.workspace

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autoproj
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.4.0
 platform: ruby
 authors:
 - Sylvain Joyeux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-04 00:00:00.000000000 Z
+date: 2018-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -228,6 +228,7 @@ files:
 - ".gitattributes"
 - ".gitignore"
 - ".travis.yml"
+- ".vscode/launch.json"
 - Gemfile
 - History.txt
 - README.md
@@ -274,13 +275,13 @@ files:
 - lib/autoproj/cli/reconfigure.rb
 - lib/autoproj/cli/reset.rb
 - lib/autoproj/cli/show.rb
-- lib/autoproj/cli/snapshot.rb
 - lib/autoproj/cli/status.rb
 - lib/autoproj/cli/switch_config.rb
 - lib/autoproj/cli/tag.rb
 - lib/autoproj/cli/test.rb
 - lib/autoproj/cli/update.rb
 - lib/autoproj/cli/versions.rb
+- lib/autoproj/cli/which.rb
 - lib/autoproj/configuration.rb
 - lib/autoproj/default.osdeps
 - lib/autoproj/environment.rb
@@ -303,6 +304,7 @@ files:
 - lib/autoproj/ops/tools.rb
 - lib/autoproj/options.rb
 - lib/autoproj/os_package_installer.rb
+- lib/autoproj/os_package_query.rb
 - lib/autoproj/os_package_resolver.rb
 - lib/autoproj/package_definition.rb
 - lib/autoproj/package_managers/apt_dpkg_manager.rb
@@ -322,8 +324,9 @@ files:
 - lib/autoproj/package_manifest.rb
 - lib/autoproj/package_selection.rb
 - lib/autoproj/package_set.rb
-- lib/autoproj/query.rb
+- lib/autoproj/query_base.rb
 - lib/autoproj/reporter.rb
+- lib/autoproj/source_package_query.rb
 - lib/autoproj/system.rb
 - lib/autoproj/templates/create-set/packages.autobuild
 - lib/autoproj/templates/create-set/source.yml
@@ -353,7 +356,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/lib/autoproj/cli/snapshot.rb

@@ -1,66 +0,0 @@
-require 'autoproj'
-require 'autoproj/cli/versions'
-
-module Autoproj
-    module CLI
-        class Snapshot
-            include Ops::Tools
-
-            attr_reader :manifest
-
-            def initialize(manifest)
-                @manifest = manifest
-            end
-
-            def parse_options(args)
-                options = Hash.new
-                parser = OptionParser.new do |opt|
-                    opt.on '-k', '--keep-going', "ignore packages that can't be snapshotted (the default is to terminate with an error)" do
-                        options[:keep_going] = true
-                    end
-                end
-                common_options(parser)
-                remaining_args = parser.parse(args)
-                return remaining_args, options
-            end
-
-            def run(target_dir, options)
-                # First, copy the configuration directory to create target_dir
-                #
-                # This must be done first as the snapshot calls might copy stuff in
-                # there
-                if File.exist?(target_dir)
-                    raise ArgumentError, "#{target_dir} already exists"
-                end
-                FileUtils.cp_r Autoproj.config_dir, target_dir
-
-                begin
-                    versions = Versions.new(manifest)
-                    versions_file = File.join(
-                        target_dir,
-                        Workspace::OVERRIDES_DIR,
-                        Versions::DEFAULT_VERSIONS_FILE_BASENAME)
-
-                    versions.run([],
-                                 replace: true,
-                                 package_sets: true,
-                                 keep_going: options[:keep_going],
-                                 output_file: versions_file)
-                rescue ::Exception
-                    FileUtils.rm_rf target_dir
-                    raise
-                end
-
-                # Finally, remove the remotes/ directory from the generated
-                # buildconf, it is obsolete now
-                FileUtils.rm_rf File.join(target_dir, 'remotes')
-
-                Autoproj.message "successfully created a snapshot of the current autoproj configuration in #{target_dir}"
-            end
-
-            def notify_env_sh_updated
-            end
-        end
-    end
-end
-