p4util 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba44e57fb399a348a5998fdc93214df6f7df3b02
-  data.tar.gz: 4391f7a98f86cbb3dfc309c69d9b6e11a7b52523
+  metadata.gz: cd44d36a39c704a989054b91c66f3480c3ff3da0
+  data.tar.gz: f1114069900aa1518b58df8f9067e662740a42c6
 SHA512:
-  metadata.gz: 288db902765dbeabecb646d6707f3f945621d7b5809f67a9d529a6309359cefa086540defbd56ca16f50c2a24f781dddc1396a8d9a8b56e4a53b8d1b54f3352f
-  data.tar.gz: 832e8df4bb34a93ddce46c47f9247fb9e9a3164d656fb5f6d557869cd513db9d66130c9ac5078af5b2dc277612ac26a5b1d091ebb3193363a6ef26eb3e4387be
+  metadata.gz: 7332c6b0104de70035fc6098dc98c52b12ee81a4a8ca32b9741aa835ff23d337c651ee2cf48cba98c9e34bf40055d0ab5ef13577a596c87a42dc384d1ec0bcf2
+  data.tar.gz: 23dc876ed087e73c468527570764cd122ddb7e2778eb4001720c3509119aafab1ce91027b42662b105bea14d08c6c9b0e7575ff43bd54419bca02515900ee3f5

data/lib/commands/init/init_model.rb

@@ -58,7 +58,7 @@ module Commands
         end
       end
 
-      def self.run(p4port)
+      def self.run(p4port, auto)
         system_settings = nil
         super_user = nil
         models = []
@@ -88,6 +88,7 @@ module Commands
         p4.port = p4port
         p4.connect
         p4.exception_level = P4::RAISE_ERRORS
+        p4.charset = 'auto' if auto
 
         if system_settings
           system_settings.execute(p4, super_user)

data/lib/commands/init.rb

@@ -14,11 +14,13 @@ module Commands
 
     p4port = '127.0.0.1:1666'
     version = nil
+    auto = false
 
     if options and !options.params.empty?
 
       op = OptionParser.new do |op|
         op.on('-p PORT', '--port PORT', 'P4PORT setting') { |x| p4port = x }
+        op.on('-a', '--auto', 'Force charset to be auto') { |x| auto = true }
         op.on('-v VERSION', '--version VERSION', 'ftp.perforce.com version') do |v|
           version = v
         end
@@ -35,7 +37,7 @@ module Commands
       init_dir = options.params.shift
     end
 
-    initialize_p4d(init_dir, p4port)
+    initialize_p4d(init_dir, p4port, auto)
   end
 
   def Commands.print_init_help
@@ -166,7 +168,7 @@ module Commands
 
   private
 
-  def Commands.initialize_p4d(init_dir, p4port)
+  def Commands.initialize_p4d(init_dir, p4port, auto)
     # Go through our init_dir, and evaluate each script as if it were defined
     # in the Commands::Init module.
     Dir.glob("#{init_dir}/**/*.rb") do |file|
@@ -177,6 +179,6 @@ module Commands
     # Note that nothing is actually done until this line. This allows classes
     # to re-define methods and do fancy shit, like, 'oh in security_settings 0
     # this guy actually doesn't have a password'.
-    Commands::Init::InitModel.run(p4port)
+    Commands::Init::InitModel.run(p4port, auto)
   end
 end

data/lib/p4util/version.rb

@@ -1,3 +1,3 @@
 module P4Util
-  VERSION = '0.1.5'
+  VERSION = '0.1.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: p4util
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Tristan Juricek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-29 00:00:00.000000000 Z
+date: 2015-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler