mediawiki_cli 0.0.0 → 0.0.1

data/lib/mediawiki_cli.rb

@@ -6,5 +6,4 @@ require 'thor'
 require 'mediawiki_cli/cli'
 require 'mediawiki_cli/list'
 require 'mediawiki_cli/export'
-require 'mediawiki_cli/import'
 require 'mediawiki_cli/xml'

data/lib/mediawiki_cli/cli.rb

@@ -3,7 +3,6 @@
 require 'media_wiki'
 require 'mediawiki_cli/list'
 require 'mediawiki_cli/export'
-require 'mediawiki_cli/import'
 require 'mediawiki_cli/xml'
 require 'thor'
 
@@ -17,8 +16,8 @@ module Mw
 		class_option :password, :type=>:string, :aliases=>"-P"
 		class_option :file, :type=>:string, :aliases=>"-F"
 
-		desc "setup", "setup"
-		def setup
+		desc "connect", "connect"
+		def connect 
 			config = symbolize_keys(to_hash(options.file)).fetch(options.wiki.to_sym) if options.file
 
 			config ||= options
@@ -28,15 +27,20 @@ module Mw
 			end
 		end
 
+		desc "import", "Import pages from file."
+		def import(*file)
+			connect
+			file.each { |f|
+				$mw.import(f)
+			}
+		end
+
 		desc "list", "list"
 		subcommand "list", List 
 
 		desc "export", "export"
 		subcommand "export", Export
 
-		desc "import", "import"
-		subcommand "import", Import
-
 		desc "xml", "xml"
 		subcommand "xml", Xml
 	end

data/lib/mediawiki_cli/export.rb

@@ -38,10 +38,7 @@ include MwGateway, FileHandler
 	desc "export", "Export a list of pages"
 	method_option :pages, :type=>:array, :aliases=>"-p", :required=>true
 	def export
-		invoke "mw:setup", [], :wiki => parent_options.wiki, 
-																:username => parent_options.username,
-																:password => parent_options.password,
-																:file => parent_options.file
+		create_gateway
 		opts = (STDIN.tty?) ? options.pages : $stdin.read.split("\n")
 		return output $mw.export(opts)
 	end

data/lib/mediawiki_cli/mwgateway.rb

@@ -3,7 +3,7 @@ module MwGateway
 	private
 	def create_gateway 
 		opts = parent_options.merge options
-		invoke "mw:setup", [], 	:wiki => opts.wiki, 
+		invoke "mw:connect", [], 	:wiki => opts.wiki, 
 														:username => opts.username,
 														:password => opts.password,
 														:file => opts.file

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mediawiki_cli
 version: !ruby/object:Gem::Version
-  version: 0.0.0
+  version: 0.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-08-10 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &2153095600 !ruby/object:Gem::Requirement
+  requirement: &2157029900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153095600
+  version_requirements: *2157029900
 - !ruby/object:Gem::Dependency
   name: mediawiki-gateway
-  requirement: &2153093860 !ruby/object:Gem::Requirement
+  requirement: &2157029020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153093860
+  version_requirements: *2157029020
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &2153092960 !ruby/object:Gem::Requirement
+  requirement: &2157028220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153092960
+  version_requirements: *2157028220
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &2153091960 !ruby/object:Gem::Requirement
+  requirement: &2157027380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *2153091960
+  version_requirements: *2157027380
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2153090740 !ruby/object:Gem::Requirement
+  requirement: &2157025880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2153090740
+  version_requirements: *2157025880
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2153089320 !ruby/object:Gem::Requirement
+  requirement: &2157023680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,7 +76,7 @@ dependencies:
         version: 1.8.4
   type: :development
   prerelease: false
-  version_requirements: *2153089320
+  version_requirements: *2157023680
 description: A command line interface for MediaWiki that offers listing, exporting,
   and importing features.
 email: mtyeh411@gmail.com
@@ -95,7 +95,6 @@ files:
 - lib/mediawiki_cli/cli.rb
 - lib/mediawiki_cli/export.rb
 - lib/mediawiki_cli/filehandler.rb
-- lib/mediawiki_cli/import.rb
 - lib/mediawiki_cli/list.rb
 - lib/mediawiki_cli/mwgateway.rb
 - lib/mediawiki_cli/xml.rb
@@ -114,7 +113,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2002296685323973285
+      hash: -3140030571154409573
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/lib/mediawiki_cli/import.rb

@@ -1,17 +0,0 @@
-require 'mediawiki_cli/mwgateway'
-require 'thor'
-
-class Import < Thor
-include MwGateway
-	namespace "mw:import"
-	default_task :import
-
-	desc "import", "Import pages from file."
-	def import(*file)
-		create_gateway(wiki)
-		file.each { |f|
-			$mw.import(file)
-		}
-	end
-end
-