build-tool 0.5.7 → 0.6.0.rc1

data/lib/build-tool/commands/modules/shell.rb

@@ -1,3 +1,6 @@
+# -*- coding: UTF-8 -*-
+
+require 'mj/tools/subprocess'
 require 'build-tool/commands'
 
 module BuildTool; module Commands; module Modules
@@ -5,14 +8,17 @@ module BuildTool; module Commands; module Modules
     #
     # BuildCommand
     #
-    class Shell < Standard
+    class MyShell < Standard
 
         include MJ::Tools::SubProcess
 
         name        "shell"
+        description "Open a shell with the environment for the given module."
 
         def initialize_options
-            @options.banner = "Usage: #{Pathname.new($0).basename} #{self.fullname} MODULE"
+            options.banner = "Usage: #{self.fullname} [OPTIONS]... MODULE"
+            options.separator( "" )
+            options.separator( "Options" )
             super
         end
 

data/lib/build-tool/commands/rebase.rb

@@ -1,3 +1,6 @@
+# -*- coding: UTF-8 -*-
+
+require 'mj/tools/subprocess'
 require 'build-tool/application'
 require 'build-tool/commands'
 
@@ -25,18 +28,26 @@ def applicable?
         end
 
         def initialize_options
-            @options.banner = "Usage: #{Pathname.new($0).basename} #{self.fullname} MODULES..."
+            options.banner = "Usage: #{self.fullname} [OPTIONS]... MODULES..."
+            options.separator( "" )
+            options.separator( "Options" )
+
+            @verbose_rebase = true
+            options.on( nil, "--[no]-verbose-rebase", "Show the changes applied by rebase." ) { |t|
+                @verbose_rebase = false
+                }
+
             super
         end
 
         def is_module_ready?( mod )
             isready = true
             if !mod.checkedout?
-                logger.info "#{mod.name}: Skipping: Not checked out."
+                info( "#{mod.name}: Skipping: Not checked out." )
             else
                 isready &= mod.ready_for_rebase
                 if !mod.vcs.fetching_supported?
-                    logger.info "#{mod.name}: Skipping: Rebasing not support by #{vcs.name}"
+                    info( "#{mod.name}: Skipping: Rebasing not support by #{mod.vcs.name}" )
                 end
             end
             return isready
@@ -45,10 +56,7 @@ def is_module_ready?( mod )
 
         def do_execute_module( mod )
             if mod.checkedout? and mod.vcs.fetching_supported?
-                logger.info "Skipping: Rebasing not support by #{vcs.name}"
-                rebase( mod )
-            else
-                logger.info "Skipping: Not checked out."
+                rebase( mod, @verbose_rebase )
             end
         end
 

data/lib/build-tool/commands/recipes.rb

@@ -1,3 +1,5 @@
+# -*- coding: UTF-8 -*-
+
 require 'build-tool/commands'
 
 module BuildTool; module Commands;
@@ -14,10 +16,6 @@ def initialize_options
             super
         end
 
-        def do_execute
-            raise NotImplementedError
-        end
-
     end # class CLI
 
 end; end # module BuildTool::Commands::RecipesCLI

data/lib/build-tool/commands/recipes/add.rb

@@ -1,9 +1,13 @@
+# -*- coding: UTF-8 -*-
+
 require 'build-tool/commands'
 require 'build-tool/recipe'
 require 'mj/vcs/git'
 
 module BuildTool; module Commands; module Recipes
 
+    class RecipeError < BuildTool::Error; end
+
     #
     # BuildCommand
     #
@@ -14,7 +18,9 @@ class Add < Standard
         long_description "Add a new recipe to build-tool from URL with NAME."
 
         def initialize_options
-            @options.banner = "Usage: #{Pathname.new($0).basename} #{self.fullname} URL NAME"
+            options.banner = "Usage: #{self.fullname} [OPTIONS]... URL NAME"
+            options.separator( "" )
+            options.separator( "Options" )
             super
         end
 
@@ -25,13 +31,21 @@ def do_execute( args )
                 return usage( "To many arguments" )
             end
 
+            if not MJ::VCS::Git.git_available?
+                raise RecipeError, 'Can\'t add recipe because git is not available'
+            end
+
             path = BuildTool::Application::instance.local_configuration_dir.join( "recipes" )
             if ! path.exist? && ! $noop
                 FileUtils.mkdir_p( path )
             end
 
             repo = MJ::VCS::Git::Repository.new(path.join(args[1]), $noop)
-            repo.clone(args[0])
+
+            branch = 'build-tool-%s' % BuildTool::VERSION.recipe_version()
+            repo.clone(args[0], branch )
+
+            logger.info( "Cloned the recipe to #{path.join(args[1] )}" )
             return 0
         end
 

data/lib/build-tool/commands/recipes/edit.rb

@@ -0,0 +1,72 @@
+# -*- coding: UTF-8 -*-
+
+require 'build-tool/commands'
+require 'build-tool/recipe'
+
+require 'fileutils'
+
+module BuildTool; module Commands; module Recipes
+
+    #
+    # BuildCommand
+    #
+    class Edit < Standard
+
+        name        "edit"
+        description "Edit the recipe."
+        long_description [ 
+            "Opens the recipe in a editor (or file browser). By default opens the override file.",
+            "The command uses xdg-open." ]
+
+        def applicable?
+            BuildTool::Application.instance.has_recipe?
+        end
+
+        def initialize_options
+            options.banner = "Usage: #{self.fullname} RECIPE [OPTIONS]... MODULE"
+            options.separator( "" )
+            options.separator( "Options" )
+
+            @global = false
+            options.on( "-g", "--global", "Open the recipe." ) { |t|
+                @global = t
+                }
+            @browser = false
+            options.on( "-b", "--browser", "Open a file browser." ) { |t|
+                @browser = t
+                }
+            super
+        end
+
+        def do_execute( args )
+            if ( args.length > 0 )
+                return usage( args.length == 0 ?  "Not enough arguments" : "To many arguments" )
+            end
+
+            rec = BuildTool::Application::instance.recipe
+
+            if @global
+                if @browser
+                    system( 'xdg-open %s' % [ rec.global_path ] )
+                else
+                    system( 'xdg-open %s' % [ rec.global_config_file_path( 'recipe' ) ] )
+                end
+            else
+                if @browser
+                    system( 'xdg-open %s' % [ rec.local_path() ] )
+                else
+                    system( 'xdg-open %s' % [ rec.local_config_file_path( 'recipe' ) ] )
+                end
+            end
+            return 0
+        end
+
+    end # class
+
+end; end # module Commands::Recipes
+
+end; # module BuildTool
+
+
+
+

data/lib/build-tool/commands/recipes/incoming.rb

@@ -1,3 +1,5 @@
+# -*- coding: UTF-8 -*-
+
 require 'build-tool/commands'
 require 'build-tool/recipe'
 require 'mj/vcs/git'
@@ -17,9 +19,10 @@ def applicable?
         end
 
         def initialize_options
-            @options.banner = "Usage: #{Pathname.new($0).basename} #{self.fullname}"
+            options.banner = "Usage: #{self.fullname} [OPTIONS]..."
+            options.separator( "" )
+            options.separator( "Options" )
 
-            @options.separator "Options:"
             @rebase = false
             @fetch = false
             options.on( "-f", "--[no-]fetch", "Fetch from origin." ) { |t|
@@ -38,19 +41,20 @@ def do_execute( args )
 
             recipe = BuildTool::Application::instance.recipe
             repo = MJ::VCS::Git::Repository.new(recipe.global_path, $noop)
+            branch = 'build-tool-%s' % BuildTool::VERSION.recipe_version()
 
             if @fetch
-                say "Fetching"
+                info( "Fetching" )
                 repo.fetch("origin")
             end
 
-            repo.log("HEAD..origin/master").each do |line|
-                say line
+            repo.log('HEAD..%s' % branch ).each do |line|
+                info( line )
             end
 
             if @rebase
-                say "Rebasing"
-                repo.rebase("master")
+                info( "Rebasing" )
+                repo.rebase( branch, 'origin' )
             end
             return 0
         end

data/lib/build-tool/commands/recipes/info.rb

@@ -1,3 +1,5 @@
+# -*- coding: UTF-8 -*-
+
 require 'build-tool/commands'
 require 'build-tool/recipe'
 
@@ -15,7 +17,9 @@ class Info < Standard
         long_description [ "Show detailed information about RECIPE." ]
 
         def initialize_options
-            @options.banner = "Usage: #{Pathname.new($0).basename} #{self.fullname} RECIPE"
+            options.banner = "Usage: #{self.fullname} RECIPE [OPTIONS]... MODULE"
+            options.separator( "" )
+            options.separator( "Options" )
             super
         end
 
@@ -25,14 +29,14 @@ def do_execute( args )
             end
 
             rec = Recipe.new( args[0] )
-            say "Description: #{rec.short_description}"
-            say "Website: #{rec.website}" if rec.website
-            say "Repository: #{rec.repository}" if rec.repository
-            say "Browse Repository: #{rec.browse_repository}" if rec.browse_repository
+            info( "Description: #{rec.short_description}" )
+            info( "Website: #{rec.website}" ) if rec.website
+            info( "Repository: #{rec.repository}" ) if rec.repository
+            info( "Browse Repository: #{rec.browse_repository}" ) if rec.browse_repository
             if rec.long_description
-                say "Long Description:"
-                    say rec.long_description
-                say ""
+                info( "Long Description:" )
+                    info( rec.long_description )
+                info( "" )
             end
 
             return 0

data/lib/build-tool/commands/recipes/install.rb

@@ -1,3 +1,5 @@
+# -*- coding: UTF-8 -*-
+
 require 'build-tool/application'
 require 'build-tool/commands'
 require 'fileutils'
@@ -15,13 +17,15 @@ class Install < Standard
                            "installed as SCRIPTNAME-build instead of RECIPE-build" ]
 
         def initialize_options
-            @options.banner = "Usage: #{Pathname.new($0).basename} #{self.fullname} RECIPE [SCRIPTNAME]"
+            options.banner = "Usage: #{self.fullname} [OPTIONS]... RECIPE [SCRIPTNAME]"
+            options.separator( "" )
+            options.separator( "Options" )
             super
         end
 
         def do_execute(args)
 
-            require 'build-tool/GUI'
+            require 'rubygems/user_interaction'
 
             # Check parameters
             if args.length < 1 or args.length > 2
@@ -40,16 +44,18 @@ def do_execute(args)
             conffile = Application::instance.local_configuration_dir.join("#{commandname}.yaml")
 
             # Our executable
-            buildtool = Application::instance.application_root.join( 'bin', $0 ).to_s
+            buildtool = Application::instance.application_root.join(
+                'bin', 
+                Pathname.new( $0 ).basename ).to_s
 
             # Load the recipe
             recipe = Recipe.find_recipe(recipename)
             if !recipe
-                logger.error "Unknown recipe #{recipename}!"
+                error( "Unknown recipe #{recipename}!" )
                 return -1
             end
 
-            say <<-EOS
+            info( <<-EOS )
 Step 1)
 We need to add a symbolic link name '#{exename}' into $PATH.
             EOS
@@ -62,24 +68,24 @@ def do_execute(args)
                     if exe.symlink? and File.identical? exe, buildtool
                         found = true
                     else
-                        logger.warn "Found another command named #{exename} at #{exe.to_s}"
+                        warn( "Found another command named #{exename} at #{exe.to_s}" )
                     end
                 end
             end
 
             if found == true
-                say "The symlink already exists. We will skip this step."
+                info( "The symlink already exists. We will skip this step." )
             else
                 dirs = find_writable_dirs( ENV['PATH'] )
                 dir = nil
                 if dirs.empty?
-                    logger.error "No writable directory found in $PATH. Please add one (usually $HOME/bin)"
-                    logger.error "or create a symbolic link in a directory that is part of $PATH yourself."
-                    logger.error "> ln -s #{buildtool} #{exename}"
+                    error( "No writable directory found in $PATH. Please add one (usually $HOME/bin)" )
+                    error( "or create a symbolic link in a directory that is part of $PATH yourself." )
+                    error( "> ln -s #{buildtool} #{exename}" )
                 elsif dirs.length == 1
                     dir = dirs[0]
-                    say "Exactly one writeable directory found in $PATH. I will create the symbolic link in"
-                    say "#{dir}"
+                    info( "Exactly one writeable directory found in $PATH. I will create the symbolic link in" )
+                    info( "#{dir}" )
                 else
                     if dirs.length > 1
                         ( dir, index ) = Gem::DefaultUserInteraction.ui.choose_from_list(
@@ -88,46 +94,35 @@ def do_execute(args)
                 end
                 link = Pathname.new(dir).join(exename)
                 if link.exist?
-                    logger.error "I can not create the link because the 'to' already exists. Please create"
-                    logger.error "a symbolic link in a directory that is part of $PATH yourself."
-                    logger.error "> ln -s #{buildtool} #{exename}"
+                    error( "I can not create the link because the 'to' already exists. Please create" )
+                    error( "a symbolic link in a directory that is part of $PATH yourself." )
+                    error( "> ln -s #{buildtool} #{exename}" )
                 else
                     File.symlink(buildtool, Pathname.new(dir).join(exename))
                 end
             end
 
             # Now write the settings file
-            say <<EOS
+            info( <<EOS )
 
 Step 2)
-I will create an example configuration file. Please open the file in a editor
-and change it to your preferences. It is important to at least set LIB_SUFFIX
-and MAKEFLAGS to values your system needs.
+A example configuration is imported into the database. I will open a editor so you are able to
+adjust it to your needs. The configuration contains comments. Please review them carefully. At
+least look at LIB_SUFFIX and MAKEFLAGS.
+EOS
 
-LIB_SUFFIX is either '64', '32' or ''. Issue 'gcc -v' and search for
---libdir=lib(64|32|). Set LIB_SUFFIX accordingly. If you can not see --libdir
-set LIB_SUFFIX to an empty string.
+            # Now switch to the correct database
+            BuildTool::Application::instance.close_database()
+            BuildTool::Application::instance.open_database( commandname )
 
-MAKEFLAGS can be used provide flags to the make command. The '-jN' options is
-used to parallelize the compiling. Set N to your the number of cpu cores+1 for
-a start.
+            # Add the recipe setting to the database. Needed to load the configuration and
+            # initialize the database.
+            rs = BuildTool::Setting.new( :name => 'BUILD_TOOL.RECIPE', :value => recipename )
+            rs.save!
 
-You will find the file at #{conffile.to_s}.
-EOS
-            if conffile.exist?
-                say "The config file already exists. I will not copy the file."
-            else
-                from = File.new(recipe.join("settings.yaml"), "r")
-                to = File.new(conffile, "w")
-                to.write("RECIPE:       #{recipename}\n\n")
-                from.each_line do |line|
-                    to.write line
-                end
-                to.close
-                from.close
-            end
+            BuildTool::Configuration.edit()
 
-            say <<EOS
+            info( <<EOS )
 
 Step 3)
 I will create a local configuration file that is used to override the used
@@ -135,14 +130,14 @@ def do_execute(args)
 > #{Application::instance.local_configuration_dir.join( commandname, 'recipe' )}
 EOS
             if File.exist?( Application::instance.local_configuration_dir.join(commandname))
-                logger.error( "Local configuration for #{commandname} already exists." )
+                error( "Local configuration for #{commandname} already exists." )
             else
                 FileUtils.mkdir_p( Application::instance.local_configuration_dir.join( commandname ) )
                 FileUtils.cp(recipe.join("recipe-local"),
                           Application::instance.local_configuration_dir.join( commandname, 'recipe' ))
             end
 
-            say <<EOS
+            info( <<EOS )
 
 Step 4)
 You now can start to use your recipe. The first commands you should look for are: