smc-get 0.1.0 → 0.2.0.beta1

data/lib/smc_get/cui_commands/list.rb

@@ -1,80 +1,101 @@
-#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 ListCommand < Command
-      
-      def self.help
-        <<EOF
-USAGE: #{File.basename($0)} list [PACKAGE]
-
-If PACKAGE is given, lists all files installed by PACKAGE. Otherwise,
-all installed packages are listed accompanied by their installation
-date in the format YY-MM-DD HH:MM, where the time is given on a
-24-hour clock.
-EOF
-      end
-      
-      def self.summary
-        "list\t\tLists all installed packages or files installed by a package. "
-      end
-      
-      def parse(args)
-            CUI.debug("Parsing #{args.count} args for list.")
-        raise(InvalidCommandline, "Too many arguments.") if args.count > 1
-        @pkg_name = args.shift #nil if not specified
-      end
-      
-      def execute(config)
-        CUI.debug("Executing help.")
-        if Package.installed_packages.empty?
-          puts "No packages installed."
-        else
-          if @pkg_name
-            pkg = Package.new(@pkg_name)
-            puts "Files installed for #{pkg}:"
-            info = pkg.spec
-            puts
-            puts "Levels:"
-            puts info["levels"].join("\n")
-            puts
-            puts "Music:"
-            puts info.has_key?("music") ? info["music"].join("\n") : "(None)"
-            puts
-            puts "Graphics:"
-            puts info.has_key?("graphics") ? info["graphics"].join("\n") : "(None)"
-          else
-            printf("%-38s | %-38s\n", "Package", "Installation date")
-            print("-" * 39, "+", "-" * 40, "\n")
-            Package.installed_packages.each do |pkg|
-              printf("%-38s | %-38s\n", pkg.name, pkg.spec_file.mtime.strftime("%d-%m-%Y %H:%M"))
-            end
-          end
-        end
-      end
-      
-    end
-    
-  end
-  
-end
+#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 ListCommand < Command
+      
+      def self.help
+        <<EOF
+USAGE: #{File.basename($0)} list [PACKAGE]
+
+If PACKAGE is given, lists all files installed by PACKAGE. Otherwise,
+all installed packages are listed accompanied by their last-update
+date in the format DD-MM-YYYY HH:MM, where the time is given on a
+24-hour clock.
+EOF
+      end
+      
+      def self.summary
+        "list\t\tLists all installed packages or files installed by a package. "
+      end
+      
+      def parse(args)
+        CUI.debug("Parsing #{args.count} args for list.")
+        raise(InvalidCommandline, "Too many arguments.") if args.count > 1
+        @pkg_name = args.shift #nil if not specified
+      end
+
+      def execute(config)
+        CUI.debug("Executing list")
+        if @pkg_name
+          spec = PackageSpecification.from_file(@cui.local_repository.fetch_spec("#{@pkg_name}.yml", SmcGet.temp_dir))
+          puts "Files installed for #{spec.name}:"
+          puts "====================#{'=' * spec.name.length}="
+          puts
+          
+          puts "Levels:"
+          if spec.levels.empty?
+            puts "\t(none)"
+          else
+            spec.levels.sort.each{|lvl| puts "\t- #{lvl}"}
+          end
+          puts
+
+          puts "Music:"
+          if spec.music.empty?
+            puts "\t(none)"
+          else
+            spec.music.sort.each{|m| puts "\t- #{m}"}
+          end
+          puts
+
+          puts "Graphics:"
+          if spec.graphics.empty?
+            puts "\t(none)"
+          else
+            spec.graphics.sort.each{|g| puts "\t- #{g}"}
+          end
+          puts
+
+          puts "Worlds:"
+          if spec.worlds.empty?
+            puts "\t(none)"
+          else
+            spec.worlds.sort.each{|w| puts "\t- #{w}"}
+          end
+        else
+          printf("%-38s | %-38s\n", "Package", "Last updated")
+          print("-" * 39, "+", "-" * 40, "\n")
+          @cui.local_repository.package_specs.sort_by{|spec| spec.name}.each do |spec|
+            #The "last update" of a package in the *local* repository is it’s installation time.
+            printf("%-38s | %-38s\n", spec.name, spec.last_update.localtime.strftime("%d-%m-%Y %H:%M"))
+          end
+        end
+      end
+      
+    end
+    
+  end
+  
+end
+# vim:set ts=8 sts=2 sw=2 et: #

data/lib/smc_get/cui_commands/search.rb

@@ -1,109 +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.
-
-OPTIONS:
-  -a\t--authors\tSearch the author list.
-  -d\t--description\tSearch the package descriptions.
-  -D\t--difficulty\tSearch the 'difficulty' fields.
-  -l\t--only-local\tOnly search local packages. Default is to search remotely.
-  -L\t--levels\tSearch for specific level names.
-  -p\t--pkgname\tSearch the package files' names.
-  -t\t--title\t\tSearch the packages' full titles.
-  
-  
-If you don't specify which fields to use, --pkgname is assumed as it performs
-best if used alone.
-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 "-p", "--pkgname" then @search_fields << :pkgname
-          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 << :pkgname if @search_fields.empty?
-        #The last command-line arg is the search query
-        @query = Regexp.new(args.shift)
-      end
-      
-      def execute(config)
-            CUI.debug("Executing search.")
-        result = SmcGet::Package.search(@query, @search_fields, @only_local)
-        return 2 if result.empty?
-        result.each do |pkg|
-          #We need to check the only_local option here, because the level
-          #version in the repository may be newer than that one installed
-          #locally. pkg.installed? wouldn't have telled us that.
-          spec = if @only_local
-            puts "[LOCAL PACKAGE]"
-            pkg.spec
-          else
-            puts "[REMOTE PACKAGE]"
-            pkg.getinfo
-          end
-          puts "Package title:     #{spec["title"]}"
-          puts "Real package name: #{pkg.name}"
-          puts "Authors:           #{spec["authors"].join(",")}"
-          puts "Difficulty:        #{spec["difficulty"]}"
-          puts "Description:"
-          puts spec["description"]
-          puts
-        end
-      end
-      
-    end
-    
-  end
-  
-end
+#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/uninstall.rb

@@ -1,78 +1,80 @@
-#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|
-          pkg = Package.new(pkg_name)
-          puts "Uninstalling #{pkg}."
-          unless pkg.installed?
-            $stderr.puts "#{pkg} is not installed. Skipping."
-            next
-          end
-          #Windows doesn't understand ANSI escape sequences, so we have to
-          #use the carriage return and reprint the whole line.
-          base_str = "\rRemoving %s... (%.2f%%)"
-          pkg.uninstall do |part, percent_part|
-            print "\r", " " * 80 #Clear everything written before
-            printf(base_str, part, percent_part)
-          end
-          puts
-        end
-      end
-      
-    end
-    
-  end
-  
-end
+#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: #