showdown-team-import 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6512fd34fe6efb4e5641b41a81dd8a44a7f979d1
-  data.tar.gz: 2502fdeda1458ef3405e99e115dd03dac9349330
+  metadata.gz: ecf800f0fcfa71cc66cd47a1c8a6684b6c86b670
+  data.tar.gz: 29fc3dd7fc9ec1a2633c5f19177175024e3bfeef
 SHA512:
-  metadata.gz: 82fa19fc50d558f68fc35fc237be8f816e8c5f8dcd7e7a600aab93ce9b85deaa2ee9e1a3afa8acc0ab6eb3381b044e6e3a907de9b1443fac0b895f0ec3ce9932
-  data.tar.gz: ede3cd6f74bd34131a2464c1ef60e3c6c79ce407c7255147eff2de3b7feb630465d9b2977ee71546c7811c2cf5c87f72573125ff79aa6d38fd6fc5f9741710be
+  metadata.gz: 45ec90b9edd14f12e6148a13f9e1b3eaa5be0df126d5eee49d97228aef0034fb9862a966db519f0bc4c061099d9743a83a74dcb275f6ac398c83ec6fa61af9e6
+  data.tar.gz: a06b294d98bbc122b2e305600459d141a49472e04270e49e612c81d4a8c8416ca5c3c98ddf3fa5e74737ffa4f1da7790dc0b2d2cd2e7119450aef31c827656c2

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.3.0

data/bin/showdown-team-import

@@ -2,19 +2,27 @@
 
 require 'fileutils'
 require 'showdown-team-import'
+require 'optparse'
 
-(puts "Usage: #{File.basename(__FILE__)} <file containing teams> [optional directory]"; exit) if ARGV.empty?
+@options = {:silent => false,
+            :path => nil,
+            :no_dirs => false}
 
-raise ArgumentError, "No file provided" if ARGV[0].nil?
-raise ArgumentError, "File doesn't exist" unless File.exists?(ARGV[0])
+OptionParser.new do |opts|
+  opts.banner = "Usage:" + " #{File.basename(__FILE__)}" + " [options] <File containing team backup>"
+  opts.on('-s', '--silent', 'Run silently') {@options[:silent] = true}
+  opts.on('-p', '--path [path]', 'Path to save to') {|v| @options[:path] = v}
+  opts.on( '-h', '--help', 'Display this screen' ) {puts opts; exit}
+  opts.on( '-n', '--no-dirs', 'Do not save in tier-specific directories (off by default)') {@options[:no_dirs] = true}
+end.parse!
+
+(puts "Input file needed. Run \"#{File.basename(__FILE__)} -h\" for more information."; exit) if ARGV.empty?
+(puts "File doesn't exist. Run \"#{File.basename(__FILE__)} -h\" for more information."; exit) unless File.exists?(ARGV[0])
 
 lines = Array.new
-dir = ARGV[1] || false
+dir = @options[:path] || nil
 
-unless dir == false
-  raise ArgumentError, "Directory is actually file" if File.file?(dir)
-  FileUtils::mkdir_p dir
-end
+((puts "Directory is actually a file. Run \"#{File.basename(__FILE__)} -h\" for more information."; exit) if File.file?(dir)) if dir
 
 File.foreach(ARGV[0]) do |line| # Necessary for skipping last empty line
   lines << line
@@ -25,8 +33,8 @@ importer = TeamImporter.new
 begin
   importer.import(lines)
 rescue ParserError => e
-  puts e.message
-  puts e.line
+  puts "An error has occurred: " + e.message
+  puts "The error occurred at the following line: " + e.line
 end
 
 teams = importer.teams
@@ -34,13 +42,20 @@ teams = importer.teams
 teams.each do |team| # actual file writing
   team_content = team.content.gsub(/\n{3,}/, "\n") # replace 3 or more newlines with a single one
   filename = team.name.delete("/").strip + ".team" # ruby mistakes / for path separator
-
-  unless dir == false
+  filename = File.join(team.tier, filename) unless @options[:no_dirs] # add tier-specific path
+
+  if dir
+    unless @options[:no_dirs]
+      FileUtils::mkdir_p File.join(dir, team.tier)
+    else
+      FileUtils::mkdir_p dir
+    end
     location = File.join(dir, filename) # saving in specified directory
   else
+    FileUtils::mkdir_p team.tier unless @options[:no_dirs]
     location = filename # saving in current directory
   end
 
-  puts "Writing \"#{location}\""
+  puts "Writing \"#{location}\"" unless @options[:silent]
   File.write(location, team_content)
 end

data/lib/showdown-team-import.rb

@@ -1,6 +1,8 @@
 # Classes related to team parsing are defined here.
 
-Team = Struct.new(:name, :content)
+require 'securerandom'
+
+Team = Struct.new(:name, :tier, :content)
 
 class ParserError < StandardError
   attr_reader :line
@@ -17,20 +19,20 @@ class TeamImporter
   end
 
   def import team_import
-    team = Team.new(String.new, String.new)
+    team = Team.new(String.new, String.new, String.new)
     line_count = 0
     in_team = false
 
     team_import.each do |line, count|
       next if line.equal? team_import.last # I haven't found any way to make this not an error except adding more shitty checks
       if in_team
-        team.content += line unless team.content.nil? && line.strip.empty? # Beginning of file
+        team.content += line unless team.content.empty? && line.strip.empty? # Beginning of file
 
         if line.strip == ''
           line_count += 1
           if line_count == 2 # 2 empty lines = end of current team
             @teams.push(team) # add team to array and reset everything
-            team = Team.new(String.new, String.new)
+            team = Team.new(String.new, String.new, String.new)
             in_team = false
             line_count = 0
           end
@@ -39,9 +41,23 @@ class TeamImporter
         end
       elsif line[0..2] == "===" && line.chomp.reverse[0..2] == "===" # beginning of team
         in_team = true
-        team.name = line[4..-5] # remove identifiers
+        name_and_tier = line[4..-5]
+        bracket_index = name_and_tier.index(']') # 10/10 code I know
+        format = name_and_tier[1..bracket_index-1] if !bracket_index.nil? && bracket_index > 2
+        format = "others" unless format
+
+        if !bracket_index.nil? && !name_and_tier[bracket_index + 1..-1].strip.empty?
+          team_name = name_and_tier[bracket_index + 1..-1]
+        elsif !name_and_tier.strip.empty? && bracket_index.nil?
+          team_name = name_and_tier
+        else
+          team_name = "Untitled [#{SecureRandom.hex[0..5]}]"
+        end
+
+        team.name = team_name
+        team.tier = format
       else
-        raise ParserError(line), "Error parsing backup file"
+        raise ParserError.new(line), "Error parsing backup file"
       end
     end
 

data/showdown-team-import.gemspec

@@ -2,11 +2,11 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: showdown-team-import 0.2.2 ruby lib
+# stub: showdown-team-import 0.3.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "showdown-team-import"
-  s.version = "0.2.2"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
@@ -28,6 +28,7 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "bin/showdown-team-import",
+    "demo.webm",
     "lib/showdown-team-import.rb",
     "showdown-team-import.gemspec"
   ]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: showdown-team-import
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - apt-get
@@ -71,6 +71,7 @@ files:
 - Rakefile
 - VERSION
 - bin/showdown-team-import
+- demo.webm
 - lib/showdown-team-import.rb
 - showdown-team-import.gemspec
 homepage: http://github.com/lc-guy/showdown-team-import