groovenauts-thor 0.19.1 → 0.19.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 50bf117f0d68ddcfe5e636f1870b2fbd2dad3fef
-  data.tar.gz: 855428579e458e1ea6a90b31af2241225b2df5f1
+  metadata.gz: 951deb43fb72171180a7b1c8252e4d828e53739d
+  data.tar.gz: d241708a49b81fc3ce9e6e9c5507b21945c5144e
 SHA512:
-  metadata.gz: e972d72e4fb95c8d2ec7eeb7778c7ec827061712134202fb762aaca9e406d0fde272dd736cc2a141f32ea9ee46e7e4c8568bffc0ff45f2cea359d75a7df62d53
-  data.tar.gz: 5765b1f7284d310098ffcb9f2e7a76ff077d15ab85aec4e1a6fc9595d883b09f50fd8d2645de7c8823b59bf023fd147085b407392cb720459de3be692ba3be2c
+  metadata.gz: 56285e5f1f3d967d1af3d1044a7aa2f08c6e918416dfd97fab455e3c94d71a7ab8280bea36dec1a3391719f7aeee3ac568303b5fdeb830e08053f56652a02438
+  data.tar.gz: c0a5863d78e69670fe0612ade541c3cf2b68dae3e2a88acca5c29bb1d0f642a667d09e24506cf9eb7d4d1843b07579a39338860eed6fa2ea529480a9a84a5a7c

data/CHANGELOG.md

@@ -1,27 +1,3 @@
-## 0.19.1, release 2014-03-24
-* Fix `say` non-String break regression
-
-## 0.19.0, release 2014-03-22
-* Add support for a default to #ask
-* Avoid @namespace not initialized warning
-* Avoid private attribute? warning
-* Fix initializing with unknown options
-* Loosen required_rubygems_version for compatibility with Ubuntu 10.04
-* Shell#ask: support a noecho option for stdin
-* Shell#ask: change API to be :echo => false
-* Display a message without a stack trace for ambiguous commands
-* Make say and say_status thread safe
-* Dependency for console io version check
-* Alias --help to help on subcommands
-* Use mime-types 1.x for Ruby 1.8.7 compatibility for Ruby 1.8 only
-* Accept .tt files as templates
-* Check if numeric value is in enum
-* Use Readline for user input
-* Fix dispatching of subcommands (concerning :help and *args)
-* Fix warnings when running specs with `$VERBOSE = true`
-* Make subcommand help more consistent
-* Make the current command chain accessible in command
-
 ## 0.18.1, release 2013-03-30
 * Revert regressions found in 0.18.0
 

data/groovenauts-thor.gemspec

@@ -10,7 +10,6 @@ Gem::Specification.new do |spec|
   spec.description = "Thor is a toolkit for building powerful command-line interfaces."
   # spec.email = "ruby-thor@googlegroups.com"
   spec.email = "t-akima@groovenauts.jp"
-  # spec.executables = %w[thor]
   spec.executables = %w[groovenauts-thor]
   spec.files = %w[.document groovenauts-thor.gemspec] + Dir['*.md', 'bin/*', 'lib/**/*.rb']
   # spec.homepage = "http://whatisthor.com/"
@@ -20,5 +19,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = %w[lib]
   spec.required_rubygems_version = ">= 1.3.5"
   spec.summary = spec.description
+  spec.test_files = Dir.glob("spec/**/*")
   spec.version = Thor::VERSION
 end

data/lib/thor/base.rb

@@ -343,7 +343,7 @@ class Thor
       #
       def all_commands
         @all_commands ||= from_superclass(:all_commands, Thor::CoreExt::OrderedHash.new)
-        @all_commands.merge!(commands)
+        @all_commands.merge(commands)
       end
       alias_method :all_tasks, :all_commands
 

data/lib/thor/core_ext/ordered_hash.rb

@@ -1,127 +1,96 @@
 class Thor
-  module CoreExt
-    class OrderedHash < ::Hash
-      if RUBY_VERSION < "1.9"
-        def initialize(*args, &block)
-          super
-          @keys = []
-        end
+  module CoreExt #:nodoc:
+    if RUBY_VERSION >= "1.9"
+      class OrderedHash < ::Hash
+      end
+    else
+      # This class is based on the Ruby 1.9 ordered hashes.
+      #
+      # It keeps the semantics and most of the efficiency of normal hashes
+      # while also keeping track of the order in which elements were set.
+      #
+      class OrderedHash #:nodoc:
+        include Enumerable
+
+        Node = Struct.new(:key, :value, :next, :prev)
 
-        def initialize_copy(other)
-          super
-          # make a deep copy of keys
-          @keys = other.keys
+        def initialize
+          @hash = {}
         end
 
-        def []=(key, value)
-          @keys << key unless key?(key)
-          super
+        def [](key)
+          @hash[key] && @hash[key].value
         end
 
-        def delete(key)
-          if key? key
-            index = @keys.index(key)
-            @keys.delete_at index
+        def []=(key, value)
+          if node = @hash[key] # rubocop:disable AssignmentInCondition
+            node.value = value
+          else
+            node = Node.new(key, value)
+
+            if !defined?(@first) || @first.nil?
+              @first = @last = node
+            else
+              node.prev = @last
+              @last.next = node
+              @last = node
+            end
           end
-          super
-        end
 
-        def delete_if
-          super
-          sync_keys!
-          self
+          @hash[key] = node
+          value
         end
 
-        alias_method :reject!, :delete_if
-
-        def reject(&block)
-          dup.reject!(&block)
-        end
+        def delete(key)
+          if node = @hash[key] # rubocop:disable AssignmentInCondition
+            prev_node = node.prev
+            next_node = node.next
 
-        def keys
-          @keys.dup
-        end
+            next_node.prev = prev_node if next_node
+            prev_node.next = next_node if prev_node
 
-        def values
-          @keys.map { |key| self[key] }
-        end
+            @first = next_node if @first == node
+            @last = prev_node  if @last  == node
 
-        def to_hash
-          self
-        end
+            value = node.value
+          end
 
-        def to_a
-          @keys.map { |key| [key, self[key]] }
+          @hash.delete(key)
+          value
         end
 
-        def each_key
-          return to_enum(:each_key) unless block_given?
-          @keys.each { |key| yield(key) }
-          self
+        def keys
+          map { |k, v| k }
         end
 
-        def each_value
-          return to_enum(:each_value) unless block_given?
-          @keys.each { |key| yield(self[key]) }
-          self
+        def values
+          map { |k, v| v }
         end
 
         def each
-          return to_enum(:each) unless block_given?
-          @keys.each { |key| yield([key, self[key]]) }
-          self
-        end
-
-        def each_pair
-          return to_enum(:each_pair) unless block_given?
-          @keys.each { |key| yield(key, self[key]) }
+          return unless defined?(@first) && @first
+          yield [@first.key, @first.value]
+          node = @first
+          yield [node.key, node.value] while node = node.next # rubocop:disable AssignmentInCondition
           self
         end
 
-        alias_method :select, :find_all
-
-        def clear
-          super
-          @keys.clear
-          self
-        end
-
-        def shift
-          k = @keys.first
-          v = delete(k)
-          [k, v]
-        end
+        def merge(other)
+          hash = self.class.new
 
-        def merge!(other_hash)
-          if block_given?
-            other_hash.each { |k, v| self[k] = key?(k) ? yield(k, self[k], v) : v }
-          else
-            other_hash.each { |k, v| self[k] = v }
+          each do |key, value|
+            hash[key] = value
           end
-          self
-        end
-
-        alias_method :update, :merge!
-
-        def merge(other_hash, &block)
-          dup.merge!(other_hash, &block)
-        end
 
-        # When replacing with another hash, the initial order of our keys must come from the other hash -ordered or not.
-        def replace(other)
-          super
-          @keys = other.keys
-          self
-        end
+          other.each do |key, value|
+            hash[key] = value
+          end
 
-        def inspect
-          "#<#{self.class} #{super}>"
+          hash
         end
 
-      private
-
-        def sync_keys!
-          @keys.delete_if { |k| !key?(k) }
+        def empty?
+          @hash.empty?
         end
       end
     end

data/lib/thor/parser/arguments.rb

@@ -1,6 +1,6 @@
 class Thor
   class Arguments #:nodoc: # rubocop:disable ClassLength
-    NUMERIC = /[-+]?(\d*\.\d+|\d+)/
+    NUMERIC = /(\d*\.\d+|\d+)/
 
     # Receives an array of args and returns two arrays, one with arguments
     # and one with switches.

data/lib/thor/parser/option.rb

@@ -108,21 +108,6 @@ class Thor
 
     def validate!
       fail ArgumentError, "An option cannot be boolean and required." if boolean? && required?
-      validate_default_type!
-    end
-
-    def validate_default_type!
-      default_type = case @default
-                     when nil
-                       return
-                     when TrueClass, FalseClass
-                       :boolean
-                     when Numeric
-                       :numeric
-                     when Hash, Array, String
-                       @default.class.name.downcase.to_sym
-                     end
-      fail ArgumentError, "An option's default must match its type." unless default_type == @type
     end
 
     def dasherized?

data/lib/thor/version.rb

@@ -1,3 +1,3 @@
 class Thor
-  VERSION = "0.19.1"
+  VERSION = "0.19.1.1"
 end

data/spec/actions/create_file_spec.rb

@@ -0,0 +1,168 @@
+require "helper"
+require "thor/actions"
+
+describe Thor::Actions::CreateFile do
+  before do
+    @silence = false
+    ::FileUtils.rm_rf(destination_root)
+  end
+
+  def create_file(destination = nil, config = {}, options = {})
+    @base = MyCounter.new([1, 2], options, :destination_root => destination_root)
+    allow(@base).to receive(:file_name).and_return("rdoc")
+
+    @action = Thor::Actions::CreateFile.new(@base, destination, "CONFIGURATION", {:verbose => !@silence}.merge(config))
+  end
+
+  def invoke!
+    capture(:stdout) { @action.invoke! }
+  end
+
+  def revoke!
+    capture(:stdout) { @action.revoke! }
+  end
+
+  def silence!
+    @silence = true
+  end
+
+  describe "#invoke!" do
+    it "creates a file" do
+      create_file("doc/config.rb")
+      invoke!
+      expect(File.exist?(File.join(destination_root, "doc/config.rb"))).to be true
+    end
+
+    it "does not create a file if pretending" do
+      create_file("doc/config.rb", {}, :pretend => true)
+      invoke!
+      expect(File.exist?(File.join(destination_root, "doc/config.rb"))).to be false
+    end
+
+    it "shows created status to the user" do
+      create_file("doc/config.rb")
+      expect(invoke!).to eq("      create  doc/config.rb\n")
+    end
+
+    it "does not show any information if log status is false" do
+      silence!
+      create_file("doc/config.rb")
+      expect(invoke!).to be_empty
+    end
+
+    it "returns the given destination" do
+      capture(:stdout) do
+        expect(create_file("doc/config.rb").invoke!).to eq("doc/config.rb")
+      end
+    end
+
+    it "converts encoded instructions" do
+      create_file("doc/%file_name%.rb.tt")
+      invoke!
+      expect(File.exist?(File.join(destination_root, "doc/rdoc.rb.tt"))).to be true
+    end
+
+    describe "when file exists" do
+      before do
+        create_file("doc/config.rb")
+        invoke!
+      end
+
+      describe "and is identical" do
+        it "shows identical status" do
+          create_file("doc/config.rb")
+          invoke!
+          expect(invoke!).to eq("   identical  doc/config.rb\n")
+        end
+      end
+
+      describe "and is not identical" do
+        before do
+          File.open(File.join(destination_root, "doc/config.rb"), "w") { |f| f.write("FOO = 3") }
+        end
+
+        it "shows forced status to the user if force is given" do
+          expect(create_file("doc/config.rb", {}, :force => true)).not_to be_identical
+          expect(invoke!).to eq("       force  doc/config.rb\n")
+        end
+
+        it "shows skipped status to the user if skip is given" do
+          expect(create_file("doc/config.rb", {}, :skip => true)).not_to be_identical
+          expect(invoke!).to eq("        skip  doc/config.rb\n")
+        end
+
+        it "shows forced status to the user if force is configured" do
+          expect(create_file("doc/config.rb", :force => true)).not_to be_identical
+          expect(invoke!).to eq("       force  doc/config.rb\n")
+        end
+
+        it "shows skipped status to the user if skip is configured" do
+          expect(create_file("doc/config.rb", :skip => true)).not_to be_identical
+          expect(invoke!).to eq("        skip  doc/config.rb\n")
+        end
+
+        it "shows conflict status to the user" do
+          file = File.join(destination_root, "doc/config.rb")
+          expect(create_file("doc/config.rb")).not_to be_identical
+          expect(Thor::LineEditor).to receive(:readline).with("Overwrite #{file}? (enter \"h\" for help) [Ynaqdh] ", anything).and_return("s")
+
+          content = invoke!
+          expect(content).to match(/conflict  doc\/config\.rb/)
+          expect(content).to match(/skip  doc\/config\.rb/)
+        end
+
+        it "creates the file if the file collision menu returns true" do
+          create_file("doc/config.rb")
+          expect(Thor::LineEditor).to receive(:readline).and_return("y")
+          expect(invoke!).to match(/force  doc\/config\.rb/)
+        end
+
+        it "skips the file if the file collision menu returns false" do
+          create_file("doc/config.rb")
+          expect(Thor::LineEditor).to receive(:readline).and_return("n")
+          expect(invoke!).to match(/skip  doc\/config\.rb/)
+        end
+
+        it "executes the block given to show file content" do
+          create_file("doc/config.rb")
+          expect(Thor::LineEditor).to receive(:readline).and_return("d", "n")
+          expect(@base.shell).to receive(:system).with(/diff -u/)
+          invoke!
+        end
+      end
+    end
+  end
+
+  describe "#revoke!" do
+    it "removes the destination file" do
+      create_file("doc/config.rb")
+      invoke!
+      revoke!
+      expect(File.exist?(@action.destination)).to be false
+    end
+
+    it "does not raise an error if the file does not exist" do
+      create_file("doc/config.rb")
+      revoke!
+      expect(File.exist?(@action.destination)).to be false
+    end
+  end
+
+  describe "#exists?" do
+    it "returns true if the destination file exists" do
+      create_file("doc/config.rb")
+      expect(@action.exists?).to be false
+      invoke!
+      expect(@action.exists?).to be true
+    end
+  end
+
+  describe "#identical?" do
+    it "returns true if the destination file exists and is identical" do
+      create_file("doc/config.rb")
+      expect(@action.identical?).to be false
+      invoke!
+      expect(@action.identical?).to be true
+    end
+  end
+end