autoproj 1.13.7 → 2.0.0.b1

data/test/ops/test_snapshot.rb

@@ -0,0 +1,26 @@
+require 'autoproj/test'
+
+module Autoproj
+    module Ops
+        describe Snapshot do
+            attr_reader :manifest
+            before do
+                @manifest = create_bootstrap
+            end
+
+            describe ".update_log_available?" do
+                it "returns false if the main configuration is not managed by git" do
+                    assert !Snapshot.update_log_available?(manifest)
+                end
+                it "returns true if the main configuration is managed by git even if it is not declared" do
+                    system("git", "init", chdir: Autoproj.config_dir, STDOUT => :close)
+                    assert Snapshot.update_log_available?(manifest)
+                end
+                it "returns true if the main configuration is managed by git and it is declared" do
+                    manifest.main_package_set.vcs = VCSDefinition.from_raw('type' => 'git', 'url' => Autoproj.config_dir)
+                    assert Snapshot.update_log_available?(manifest)
+                end
+            end
+        end
+    end
+end

data/test/test_package.rb

@@ -0,0 +1,30 @@
+require 'autoproj/test'
+require 'autoproj/autobuild'
+
+describe Autobuild::Package do
+    describe "#remove_dependency" do
+        attr_reader :pkg
+        before do
+            @pkg = Autobuild.import('pkg')
+            Autobuild.import('dep')
+        end
+
+        it "removes direct dependencies" do
+            pkg.dependencies << 'dep'
+            pkg.remove_dependency 'dep'
+            assert !pkg.dependencies.include?('dep')
+        end
+
+        it "removes optional dependencies" do
+            pkg.optional_dependency 'dep'
+            pkg.remove_dependency 'dep'
+            assert !pkg.optional_dependencies.include?('dep')
+        end
+
+        it "removes OS dependencies" do
+            pkg.os_packages << 'dep'
+            pkg.remove_dependency 'dep'
+            assert !pkg.os_packages.include?('dep')
+        end
+    end
+end

data/test/test_vcs_definition.rb

@@ -0,0 +1,46 @@
+require 'autoproj/test'
+require 'fakefs/safe'
+
+describe Autoproj::VCSDefinition do
+    describe ".vcs_definition_to_hash" do
+        before do
+            FakeFS.activate!
+        end
+
+        after do
+            FakeFS.deactivate!
+            FakeFS::FileSystem.clear
+        end
+
+        it "interprets plain strings as local directories" do
+            FileUtils.mkdir_p '/test'
+            vcs = Autoproj::VCSDefinition.from_raw('/test')
+            assert vcs.local?
+            assert_equal '/test', vcs.url
+        end
+
+        it "interprets the type:url shortcut" do
+            vcs = Autoproj::VCSDefinition.from_raw('git:git@github.com')
+            assert_equal 'git', vcs.type
+            assert_equal 'git@github.com', vcs.url
+        end
+
+        it "normalizes the standard format" do
+            vcs = Autoproj::VCSDefinition.from_raw(Hash['type' => 'git', 'url' => 'u', 'branch' => 'b'])
+            assert_equal 'git', vcs.type
+            assert_equal 'u', vcs.url
+            assert_equal 'b', vcs.options[:branch]
+        end
+    end
+
+    describe "#create_autobuild_importer" do
+        it "does not create an importer if type is none" do
+            vcs = Autoproj::VCSDefinition.from_raw(type: 'none', url: nil)
+            assert !vcs.create_autobuild_importer
+        end
+        it "does not create an importer if type is local" do
+            vcs = Autoproj::VCSDefinition.from_raw(type: 'local', url: '/test')
+            assert !vcs.create_autobuild_importer
+        end
+    end
+end

metadata

@@ -1,20 +1,23 @@
 --- !ruby/object:Gem::Specification
 name: autoproj
 version: !ruby/object:Gem::Version
-  version: 1.13.7
+  version: 2.0.0.b1
 platform: ruby
 authors:
 - Rock Core Developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-03 00:00:00.000000000 Z
+date: 2015-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: autobuild
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.9'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.9.0
   type: :runtime
@@ -22,6 +25,9 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.9'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.9.0
 - !ruby/object:Gem::Dependency
@@ -29,6 +35,9 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.0
   type: :runtime
@@ -36,22 +45,31 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.7.0
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +90,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.14'
+        version: '3.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.14'
+        version: '3.13'
 description: autoproj is a manager for sets of software packages. It allows the user
   to import and build packages from source, still using the underlying distribution's
   native package manager for software that is available on it.
@@ -88,29 +106,9 @@ executables:
 - alocate
 - amake
 - aup
-- autolocate
 - autoproj
-- autoproj-bootstrap
-- autoproj-cache
-- autoproj-clean
-- autoproj-commit
-- autoproj-create-set
-- autoproj-doc
-- autoproj-envsh
-- autoproj-list
-- autoproj-locate
-- autoproj-log
-- autoproj-query
-- autoproj-reset
-- autoproj-show
-- autoproj-snapshot
-- autoproj-switch-config
-- autoproj-tag
-- autoproj-test
-- autoproj-versions
 - autoproj_bootstrap
 - autoproj_bootstrap.in
-- autoproj_stress_test
 extensions: []
 extra_rdoc_files:
 - History.txt
@@ -118,6 +116,7 @@ extra_rdoc_files:
 - README.md
 - samples/autoproj/README.txt
 files:
+- ".gemtest"
 - History.txt
 - Manifest.txt
 - README.md
@@ -125,43 +124,43 @@ files:
 - bin/alocate
 - bin/amake
 - bin/aup
-- bin/autolocate
 - bin/autoproj
-- bin/autoproj-bootstrap
-- bin/autoproj-cache
-- bin/autoproj-clean
-- bin/autoproj-commit
-- bin/autoproj-create-set
-- bin/autoproj-doc
-- bin/autoproj-envsh
-- bin/autoproj-list
-- bin/autoproj-locate
-- bin/autoproj-log
-- bin/autoproj-query
-- bin/autoproj-reset
-- bin/autoproj-show
-- bin/autoproj-snapshot
-- bin/autoproj-switch-config
-- bin/autoproj-tag
-- bin/autoproj-test
-- bin/autoproj-versions
 - bin/autoproj_bootstrap
 - bin/autoproj_bootstrap.in
-- bin/autoproj_stress_test
 - lib/autoproj.rb
 - lib/autoproj/autobuild.rb
 - lib/autoproj/base.rb
 - lib/autoproj/build_option.rb
 - lib/autoproj/cli.rb
+- lib/autoproj/cli/base.rb
+- lib/autoproj/cli/bootstrap.rb
+- lib/autoproj/cli/build.rb
+- lib/autoproj/cli/cache.rb
+- lib/autoproj/cli/clean.rb
+- lib/autoproj/cli/commit.rb
+- lib/autoproj/cli/doc.rb
+- lib/autoproj/cli/envsh.rb
+- lib/autoproj/cli/inspection_tool.rb
+- lib/autoproj/cli/locate.rb
+- lib/autoproj/cli/log.rb
+- lib/autoproj/cli/main.rb
+- lib/autoproj/cli/main_test.rb
+- lib/autoproj/cli/osdeps.rb
+- lib/autoproj/cli/query.rb
+- 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/cmdline.rb
 - lib/autoproj/configuration.rb
 - lib/autoproj/default.osdeps
 - lib/autoproj/environment.rb
+- lib/autoproj/exceptions.rb
 - lib/autoproj/gitorious.rb
 - lib/autoproj/installation_manifest.rb
 - lib/autoproj/manifest.rb
@@ -169,6 +168,7 @@ files:
 - lib/autoproj/ops/build.rb
 - lib/autoproj/ops/cache.rb
 - lib/autoproj/ops/configuration.rb
+- lib/autoproj/ops/import.rb
 - lib/autoproj/ops/loader.rb
 - lib/autoproj/ops/main_config_switcher.rb
 - lib/autoproj/ops/snapshot.rb
@@ -180,6 +180,7 @@ files:
 - lib/autoproj/package_selection.rb
 - lib/autoproj/package_set.rb
 - lib/autoproj/query.rb
+- lib/autoproj/reporter.rb
 - lib/autoproj/system.rb
 - lib/autoproj/templates/create-set/packages.autobuild
 - lib/autoproj/templates/create-set/source.yml
@@ -187,6 +188,7 @@ files:
 - lib/autoproj/variable_expansion.rb
 - lib/autoproj/vcs_definition.rb
 - lib/autoproj/version.rb
+- lib/autoproj/workspace.rb
 - samples/autoproj/README.txt
 - samples/autoproj/init.rb
 - samples/autoproj/manifest
@@ -208,6 +210,7 @@ files:
 - test/data/test_manifest/autoproj/local_set/source.yml
 - test/data/test_manifest/autoproj/manifest
 - test/ops/test_configuration.rb
+- test/ops/test_snapshot.rb
 - test/package_managers/apt-dpkg-status
 - test/package_managers/apt-dpkg-status.installed-last
 - test/package_managers/apt-dpkg-status.noninstalled-last
@@ -216,7 +219,9 @@ files:
 - test/package_managers/test_pip.rb
 - test/test_manifest.rb
 - test/test_os_dependencies.rb
+- test/test_package.rb
 - test/test_package_manifest.rb
+- test/test_vcs_definition.rb
 homepage: http://rock-robotics.org/documentation/autoproj
 licenses:
 - BSD
@@ -234,12 +239,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Easy installation and management of sets of software packages

data/bin/autolocate

@@ -1,3 +0,0 @@
-#! /usr/bin/env ruby
-load File.expand_path('autoproj-locate', File.dirname(__FILE__))
-

data/bin/autoproj-bootstrap

@@ -1,68 +0,0 @@
-#! /usr/bin/env ruby
-require 'autoproj'
-require 'autoproj/ops/main_config_switcher'
-
-root_dir = Dir.pwd
-if File.exists?(File.join(root_dir, 'autoproj', "manifest"))
-    raise ConfigError.new, "this installation is already bootstrapped. Remove the autoproj directory if it is not the case"
-end
-
-Autoproj.root_dir = root_dir
-Autoproj.manifest = Autoproj::Manifest.new
-Ops::Tools.load_autoprojrc
-Autoproj.prepare_environment
-
-# Check if the .autoprojrc changed the PATH and therefore which autoproj script
-# should be executed ... and restart if it did
-autoproj_path = Autobuild.find_in_path('autoproj')
-if $0 != autoproj_path
-    puts "your .autoprojrc file changed PATH in a way that requires the restart of autoproj"
-
-    if ENV['AUTOPROJ_RESTARTING']
-        puts "infinite loop detected, will not restart this time"
-    else
-        require 'rbconfig'
-        exec(Autoproj.config.ruby_executable, autoproj_path, *Autoproj::CmdLine.argv)
-    end
-end
-
-Autoproj::CmdLine.report do
-    switcher = Autoproj::Ops::MainConfigSwitcher.new(root_dir)
-    begin
-        switcher.bootstrap(*ARGV)
-        Autoproj.save_config
-
-        STDERR.puts <<EOTEXT
-
-
-#{color('autoproj bootstrap successfully finished', :green, :bold)}
-
-#{color('To further use autoproj and the installed software', :bold)}, you
-must add the following line at the bottom of your .bashrc:
-  source #{root_dir}/#{Autoproj::ENV_FILENAME}
-
-WARNING: autoproj will not work until your restart all
-your consoles, or run the following in them:
-  $ source #{root_dir}/#{Autoproj::ENV_FILENAME}
-
-#{color('To import and build the packages', :bold)}, you can now run
-  aup
-  amake
-
-The resulting software is installed in
-  #{root_dir}/install
-
-EOTEXT
-
-    rescue RuntimeError
-        STDERR.puts <<-EOTEXT
-#{color('autoproj bootstrap failed', :red, :bold)}
-To retry, first source the #{Autoproj::ENV_FILENAME} script with
-  source #{root_dir}/#{Autoproj::ENV_FILENAME}
-and then re-run autoproj bootstrap
-  autoproj bootstrap '#{ARGV.join("'")}'
-    EOTEXT
-
-        raise
-    end
-end

data/bin/autoproj-cache

@@ -1,18 +0,0 @@
-#! /usr/bin/env ruby
-
-require 'autoproj'
-require 'autoproj/ops/cache'
-
-root_dir = Autoproj::CmdLine.initialize_root_directory
-
-Autoproj::CmdLine.report do
-    cache_dir, *_ =
-        Autoproj.silent do
-            Autoproj::CmdLine.initialize_and_load(ARGV)
-        end
-    cache_dir = File.expand_path(cache_dir, root_dir)
-
-    cache_op = Autoproj::Ops::Cache.new(cache_dir, Autoproj.manifest)
-    cache_op.create_or_update(Autobuild.ignore_errors)
-end
-