smc-get 0.2.0.beta1 → 0.3.0.beta1

data/lib/smc_get/cui_commands/search.rb

@@ -1,106 +1,106 @@
-#Encoding: UTF-8
-################################################################################
-# This file is part of smc-get.
-# Copyright (C) 2010-2011 Entertaining Software, Inc.
-# Copyright (C) 2011 Marvin Gülker
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-################################################################################
-
-module SmcGet
-  
-  module CUICommands
-    
-    class SearchCommand < Command
-      
-      def self.help
-        <<HELP
-USAGE: #{File.basename($0)} search [-a][-d][-D][-l][-L][-p][-t] QUERY
-
-Searches the local or remote repository for packages. QUERY is assumed
-to be a regular expression (be sure to quote it in order to prevent
-shell expansion!).
-
-OPTIONS:
-  -a\t--authors\tSearch the author list.
-  -d\t--description\tSearch the package descriptions.
-  -D\t--difficulty\tSearch the 'difficulty' fields.
-  -i\t--ignore-case\tTreat QUERY as case-insensitive.
-  -l\t--only-local\tOnly search local packages. Default is to search remotely.
-  -L\t--levels\tSearch for specific level names.
-  -n\t--name\tSearch the package files' names.
-  -t\t--title\t\tSearch the packages' full titles.
-  
-  
-If you don't specify which fields to use, --name is assumed as it doesn't have
-to download all the package specifications only for searching.
-HELP
-      end
-      
-      def self.summary
-        "search\tSearch for a package."
-      end
-      
-      def parse(args)
-        CUI.debug("Parsing #{args.count} args for search.")
-        raise(InvalidCommandline, "No query given.") if args.empty?
-        @search_fields = []
-        @only_local = false
-        
-        while args.count > 1
-          arg = args.shift
-          case arg
-          when "-l", "--only-local" then @only_local = true
-          when "-t", "--title" then @search_fields << :title
-          when "-d", "--description" then @search_fields << :description
-          when "-a", "--authors" then @search_fields << :authors
-          when "-D", "--difficulty" then @search_fields << :difficulty
-          when "-L", "--levels" then @search_fields << :levels
-          when "-n", "--name" then @search_fields << :name
-          when "-i", "--ignore-case" then @ignore_case = true
-          else
-            raise(InvalidCommandline, "Invalid argument #{arg}.")
-          end
-        end
-        #If no search fields were specified, default to :pkgname, because
-        #it causes the least network traffic.
-        @search_fields << :name if @search_fields.empty?
-        #The last command-line arg is the search query
-        @query = @ignore_case ? Regexp.new(args.shift, Regexp::IGNORECASE) : Regexp.new(args.shift)
-      end
-
-      def execute(config)
-        CUI.debug("Executing search")
-        repo = @only_local ? @cui.local_repository : @cui.remote_repository
-        
-        repo.search(@query, *@search_fields) do |pkgname|
-          if @only_local then puts "[LOCAL PACKAGE]" else puts "[REMOTE PACKAGE]" end
-
-          spec = PackageSpecification.from_file(repo.fetch_spec("#{pkgname}.yml", SmcGet.temp_dir))
-          puts "Package title:     #{spec.title}"
-          puts "Real package name: #{spec.name}" #Should be the same as the pkgname variable
-          puts "Authors:           #{spec.authors.join(', ')}"
-          puts "Difficulty:        #{spec.difficulty}"
-          puts "Description:"
-          puts spec.description
-          puts #For separating the next search result
-        end
-      end
-      
-    end
-    
-  end
-  
-end
-# vim:set ts=8 sts=2 sw=2 et: #
+#Encoding: UTF-8
+################################################################################
+# This file is part of smc-get.
+# Copyright (C) 2010-2011 Entertaining Software, Inc.
+# Copyright (C) 2011 Marvin Gülker
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+################################################################################
+
+module SmcGet
+  
+  module CUICommands
+    
+    class SearchCommand < Command
+      
+      def self.help
+        <<HELP
+USAGE: #{File.basename($0)} search [-a][-d][-D][-l][-L][-p][-t] QUERY
+
+Searches the local or remote repository for packages. QUERY is assumed
+to be a regular expression (be sure to quote it in order to prevent
+shell expansion!).
+
+OPTIONS:
+  -a\t--authors\tSearch the author list.
+  -d\t--description\tSearch the package descriptions.
+  -D\t--difficulty\tSearch the 'difficulty' fields.
+  -i\t--ignore-case\tTreat QUERY as case-insensitive.
+  -l\t--only-local\tOnly search local packages. Default is to search remotely.
+  -L\t--levels\tSearch for specific level names.
+  -n\t--name\tSearch the package files' names.
+  -t\t--title\t\tSearch the packages' full titles.
+  
+  
+If you don't specify which fields to use, --name is assumed as it doesn't have
+to download all the package specifications only for searching.
+HELP
+      end
+      
+      def self.summary
+        "search\tSearch for a package."
+      end
+      
+      def parse(args)
+        CUI.debug("Parsing #{args.count} args for search.")
+        raise(InvalidCommandline, "No query given.") if args.empty?
+        @search_fields = []
+        @only_local = false
+        
+        while args.count > 1
+          arg = args.shift
+          case arg
+          when "-l", "--only-local" then @only_local = true
+          when "-t", "--title" then @search_fields << :title
+          when "-d", "--description" then @search_fields << :description
+          when "-a", "--authors" then @search_fields << :authors
+          when "-D", "--difficulty" then @search_fields << :difficulty
+          when "-L", "--levels" then @search_fields << :levels
+          when "-n", "--name" then @search_fields << :name
+          when "-i", "--ignore-case" then @ignore_case = true
+          else
+            raise(InvalidCommandline, "Invalid argument #{arg}.")
+          end
+        end
+        #If no search fields were specified, default to :pkgname, because
+        #it causes the least network traffic.
+        @search_fields << :name if @search_fields.empty?
+        #The last command-line arg is the search query
+        @query = @ignore_case ? Regexp.new(args.shift, Regexp::IGNORECASE) : Regexp.new(args.shift)
+      end
+
+      def execute(config)
+        CUI.debug("Executing search")
+        repo = @only_local ? @cui.local_repository : @cui.remote_repository
+        
+        repo.search(@query, *@search_fields) do |pkgname|
+          if @only_local then puts "[LOCAL PACKAGE]" else puts "[REMOTE PACKAGE]" end
+
+          spec = PackageSpecification.from_file(repo.fetch_spec("#{pkgname}.yml", SmcGet.temp_dir))
+          puts "Package title:     #{spec.title}"
+          puts "Real package name: #{spec.name}" #Should be the same as the pkgname variable
+          puts "Authors:           #{spec.authors.join(', ')}"
+          puts "Difficulty:        #{spec.difficulty}"
+          puts "Description:"
+          puts spec.description
+          puts #For separating the next search result
+        end
+      end
+      
+    end
+    
+  end
+  
+end
+# vim:set ts=8 sts=2 sw=2 et: #

data/lib/smc_get/cui_commands/server.rb

@@ -0,0 +1,76 @@
+# -*- coding: utf-8 -*-
+################################################################################
+# This file is part of smc-get.
+# Copyright (C) 2010-2011 Entertaining Software, Inc.
+# Copyright (C) 2011 Marvin Gülker
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+################################################################################
+
+class SmcGet::CUICommands::ServerCommand < SmcGet::CUICommands::Command
+
+  def self.help
+    <<-EOF
+USAGE: #{File.basename($0)} server [-p PORT] [DIRECTORY]
+
+Starts a simple static file server you can use to connect to
+with another instance of #{File.basename($0)}. Note that it uses
+Ruby's WEBrick, which is known to not be suitable for production
+environments, so don't use this command for anything else than
+serving small more-or-less private SMC repositories. Have a look
+at robust servers like apache or nginx for making it available to
+the public.
+
+If DIRECTORY is given, uses that directory for the server root
+directory. Otherwise, uses the current working directory.
+
+OPTIONS
+-p PORT\t--port PORT\tListen on this port instead of the default 3000.
+    EOF
+  end
+
+  def self.summary
+    "server\tStart a repository server."
+  end
+
+  def parse(args)
+    SmcGet::CUI.debug("Parsing #{args.count} args for server.")
+    
+    until args.empty?
+      arg = args.shift
+      case arg
+      when "--port", "-p" then @port = args.shift || raise(InvalidCommandline, "No port given.")
+      else
+        @directory = Pathname.new(arg).expand_path
+      end
+    end
+    
+    @directory ||= Pathname.pwd
+    @port      ||= 3000
+  end
+
+  def execute(config)
+    server  = WEBrick::HTTPServer.new(Port: @port)
+    server[:Logger].info("Serving directory #@directory.")
+    server.mount("/", WEBrick::HTTPServlet::FileHandler, @directory)
+    
+    Signal.trap("SIGINT") do
+      server[:Logger].info("Cought SIGINT, stopping...")
+      server.stop
+    end
+    
+    server.start
+  end
+
+end

data/lib/smc_get/cui_commands/uninstall.rb

@@ -1,80 +1,77 @@
-#Encoding: UTF-8
-################################################################################
-# This file is part of smc-get.
-# Copyright (C) 2010-2011 Entertaining Software, Inc.
-# Copyright (C) 2011 Marvin Gülker
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-################################################################################
-
-module SmcGet
-  
-  module CUICommands
-    
-    class UninstallCommand < Command
-      
-      def self.help
-        <<EOF
-#{File.basename($0)} uninstall PACKAGES
-
-Removes PACKAGES from your set of downloaded packages.
-EOF
-      end
-      
-      def self.summary
-        "uninstall\tUninstalls one or more packages."
-      end
-      
-      def parse(args)
-        CUI.debug("Parsing #{args.count} args for uninstall.")
-        raise(InvalidCommandline, "No package given.") if args.empty?
-        @pkg_names = []
-        until args.empty?
-          arg = args.shift
-          #case arg
-          #when "-c", "--my-arg" then ...
-          #else
-          @pkg_names << arg
-          $stderr.puts("Unkown argument #{arg}. Treating it as a package.") if arg.start_with?("-")
-          #end
-        end
-      end
-      
-      def execute(config)
-        CUI.debug("Executing uninstall.")
-        @pkg_names.each do |pkg_name|
-          if @cui.local_repository.contains?(pkg_name)
-            spec = PackageSpecification.from_file(@cui.local_repository.fetch_spec("#{pkg_name}.yml", SmcGet.temp_dir))
-            puts spec.remove_message if spec.remove_message
-            print "Removing #{pkg_name}... "
-            @cui.local_repository.uninstall(pkg_name) do |conflict_file|
-              puts "CONFLICT: The file #{conflict_file} has been modified. What now?"
-              puts "1) Ignore and delete anyway"
-              puts "2) Copy file and include MODIFIED in the name."
-              print "Enter a number[1]: "
-              $stdin.gets.chomp.to_i == 2 #True means copying
-            end
-            puts "Done."
-          else
-            $stderr.puts "#{pkg_name} is not installed. Skipping."
-          end
-        end
-      end
-      
-    end
-    
-  end
-  
-end
-# vim:set ts=8 sts=2 sw=2 et: #
+#Encoding: UTF-8
+################################################################################
+# This file is part of smc-get.
+# Copyright (C) 2010-2011 Entertaining Software, Inc.
+# Copyright (C) 2011 Marvin Gülker
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+################################################################################
+
+module SmcGet
+  
+  module CUICommands
+    
+    class UninstallCommand < Command
+      
+      def self.help
+        <<EOF
+#{File.basename($0)} uninstall PACKAGES
+
+Removes PACKAGES from your set of downloaded packages.
+
+OPTIONS:
+-y\t--yes\tAssume yes on all queries
+EOF
+      end
+      
+      def self.summary
+        "uninstall\tUninstalls one or more packages."
+      end
+      
+      def parse(args)
+        CUI.debug("Parsing #{args.count} args for uninstall.")
+        raise(InvalidCommandline, "No package given.") if args.empty?
+        @pkg_names = []
+        @assume_yes = false
+        until args.empty?
+          arg = args.shift
+          case arg
+          when "-y", "--yes" then @assume_yes = true
+          else
+            @pkg_names << arg
+            $stderr.puts("Unkown argument #{arg}. Treating it as a package.") if arg.start_with?("-")
+          end
+        end
+      end
+      
+      def execute(config)
+        CUI.debug("Executing uninstall.")
+        @pkg_names.each do |pkg_name|
+          if @cui.local_repository.contains?(pkg_name)
+            spec = PackageSpecification.from_file(@cui.local_repository.fetch_spec("#{pkg_name}.yml", SmcGet.temp_dir))
+            puts spec.remove_message if spec.remove_message
+            puts "Removing #{pkg_name}... "
+            uninstall_package(pkg_name, @assume_yes, @assume_yes)
+          else
+            $stderr.puts "#{pkg_name} is not installed. Skipping."
+          end
+        end
+      end
+      
+    end
+    
+  end
+  
+end
+# vim:set ts=8 sts=2 sw=2 et: #

data/lib/smc_get/cui_commands/update.rb

@@ -1,119 +1,107 @@
-#Encoding: UTF-8
-################################################################################
-# This file is part of smc-get.
-# Copyright (C) 2010-2011 Entertaining Software, Inc.
-# Copyright (C) 2011 Marvin Gülker
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-################################################################################
-
-module SmcGet
-  
-  module CUICommands
-    
-    class UpdateCommand < Command
-      
-      def self.help
-        <<EOF
-USAGE: #{File.basename($0)} update [PACKAGES...]
-
-Checks for updates in the repository and tries to update the local
-packages. If you modified a package, you will be prompted to
-decide how to proceed.
-
-OPTIONS:
--y\t--yes\tAssume yes on all queries
-EOF
-      end
-      
-      def self.summary
-        "update\tUpdate packages."
-      end
-      
-      def parse(args)
-        CUI.debug("Parsing #{args.count} args for update.")
-        @packages = []
-        while(arg = args.shift)
-          case arg
-          when "-y", "--yes" then @assume_yes = true
-          else
-            @packages << arg
-          end
-        end
-        #Warn on package names starting with a hyphen, may be a mistyped option
-        @packages.each{|pkg| $stderr.puts("Warning: Treating #{pkg} as a package") if pkg.start_with?("-")}
-      end
-      
-      def execute(config)
-        CUI.debug("Executing update")
-
-        #Get the packages we want to update
-        if @packages.empty? #None given, default to all
-          packages = @cui.local_repository.package_specs.map(&:name)
-        else
-          packages = @packages
-        end
-        puts "Going to check #{packages.count} packages for updates."
-        
-        packages.each do |pkgname|
-          spec_name = "#{pkgname}.yml"
-          local_spec = PackageSpecification.from_file(@cui.local_repository.fetch_spec(spec_name))
-          remote_spec = PackageSpecification.from_file(@cui.remote_repository.fetch_spec(spec_name))
-
-          #Execute update if remote is newer than local
-          if remote_spec.last_update > local_spec.last_update
-
-            puts "Updating #{pkgname}."
-            begin
-              path = download_package(pkgname)
-              
-              #First uninstall the old version--this is necessary, b/c a new
-              #version of a package may have files removed that wouldn’t be
-              #deleted by a simple overwrite operation.
-              print "Uninstalling obsolete version of #{pkgname}... "
-              @cui.local_repository.uninstall(pkgname) do |conflict_file|
-                puts "CONFLICT: The file #{conflict_file} has been modified. What now?"
-                puts "1) Ignore and delete anyway"
-                puts "2) Copy file and include MODIFIED in the name."
-                print "Enter a number[1]: "
-                $stdin.gets.chomp.to_i == 2 #True means copying
-              end
-              puts "Done."
-              
-              #Then install the new version.
-              pkg = Package.from_file(path)
-              puts pkg.spec.install_message if pkg.spec.install_message
-              print "Installing #{pkgname}... "
-              @cui.local_repository.install(pkg)
-              puts "Done."
-            rescue => e
-              $stderr.puts(e.message)
-              $stderr.puts("Ignoring the problem and continuing with the next package, if any.")
-              if CUI.debug_mode?
-                $stderr.puts("Class: #{e.class}")
-                $stderr.puts("Message: #{e.message}")
-                $stderr.puts("Backtrace:")
-                $stderr.puts(e.backtrace.join("\n\t"))
-              end
-            end
-          end
-        end
-      end
-      
-    end
-    
-  end
-  
-end
-# vim:set ts=8 sts=2 sw=2 et: #
+#Encoding: UTF-8
+################################################################################
+# This file is part of smc-get.
+# Copyright (C) 2010-2011 Entertaining Software, Inc.
+# Copyright (C) 2011 Marvin Gülker
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+################################################################################
+
+module SmcGet
+  
+  module CUICommands
+    
+    class UpdateCommand < Command
+      
+      def self.help
+        <<EOF
+USAGE: #{File.basename($0)} update [PACKAGES...]
+
+Checks for updates in the repository and tries to update the local
+packages. If you modified a package, you will be prompted to
+decide how to proceed.
+
+OPTIONS:
+-y\t--yes\tAssume yes on all queries
+EOF
+      end
+      
+      def self.summary
+        "update\tUpdate packages."
+      end
+      
+      def parse(args)
+        CUI.debug("Parsing #{args.count} args for update.")
+        @packages = []
+        @assume_yes = false
+        while(arg = args.shift)
+          case arg
+          when "-y", "--yes" then @assume_yes = true
+          else
+            @packages << arg
+          end
+        end
+        #Warn on package names starting with a hyphen, may be a mistyped option
+        @packages.each{|pkg| $stderr.puts("Warning: Treating #{pkg} as a package") if pkg.start_with?("-")}
+      end
+      
+      def execute(config)
+        CUI.debug("Executing update")
+
+        #Get the packages we want to update
+        if @packages.empty? #None given, default to all
+          packages = @cui.local_repository.package_specs.map(&:name)
+        else
+          packages = @packages
+        end
+        puts "Going to check #{packages.count} packages for updates."
+        
+        packages.each do |pkgname|
+          spec_name = "#{pkgname}.yml"
+          local_spec = PackageSpecification.from_file(@cui.local_repository.fetch_spec(spec_name))
+          remote_spec = PackageSpecification.from_file(@cui.remote_repository.fetch_spec(spec_name))
+
+          #Execute update if remote is newer than local
+          if remote_spec.last_update > local_spec.last_update
+
+            puts "Updating #{pkgname}."
+            begin
+              #First uninstall the old version--this is necessary, b/c a new
+              #version of a package may have files removed that wouldn’t be
+              #deleted by a simple overwrite operation.
+              puts "Uninstalling obsolete version of #{pkgname}... "
+              uninstall_package(pkgname, true, @assume_yes) #We ignore dependencies as we immediately reinstall a package
+              
+              #Then install the new version.
+              install_package_with_deps(pkgname, @assume_yes)
+            rescue => e
+              $stderr.puts(e.message)
+              $stderr.puts("Ignoring the problem and continuing with the next package, if any.")
+              if CUI.debug_mode?
+                $stderr.puts("Class: #{e.class}")
+                $stderr.puts("Message: #{e.message}")
+                $stderr.puts("Backtrace:")
+                $stderr.puts(e.backtrace.join("\n\t"))
+              end
+            end
+          end
+        end
+      end
+      
+    end
+    
+  end
+  
+end
+# vim:set ts=8 sts=2 sw=2 et: #