pineapples 0.3.34 → 0.3.345

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4168dcbfa92187c3d8bcf7b67f594cb7a3308067
-  data.tar.gz: 9fd839446bd1602e213722deb11049aa9cd9c642
+  metadata.gz: 6f0f84c10a46a615eba4dfc22bf19092b18c9e2e
+  data.tar.gz: f5f427c5265408244a73c6369dc2a073b3dc3ade
 SHA512:
-  metadata.gz: 92f8f1dfe6d724cc76085cd4cda7f55c0ba0bb03557292b156310b3613c5afbd70d75537abffc289c513a7280068ba4b2d1f9c3d152f276e8e84867be3279fb5
-  data.tar.gz: fedbe56b5c2475020d96dabe94a904cf4b11ff6c41bf3994a98e3a7724b32ad0b9581d5b3a61613da04d4887f5976452ccf0ba41dba520d8297fba1a11b551dd
+  metadata.gz: 2b0c292b8573424558413899a0c3a70350eb9d3a35906c348d149b67690e85d2d8b376efecfc6db65219e9f432d8f864cc37e862f81fcab2c5fa71fe9ea797d2
+  data.tar.gz: 9926d77f2319243f47332624b82a8fda99595dc91f884bfe8f626903cf611f6704a5ac26ade0090ed84b6e0445aab8a156e298eebbf6f0f62fe608a6d0ca59b7

data/bin/pineapples

@@ -1,13 +1,13 @@
-#!/usr/bin/env ruby
-require 'pathname'
-
-source_path = (Pathname.new(__FILE__).dirname + '../lib').expand_path
-$LOAD_PATH << source_path
-
-require 'pineapples'
-
-$terminal.indent_size = 2
-
-options = Pineapples::Parser.parse(ARGV)
-generator = Pineapples::AppGenerator.new(options)
-generator.start!
+#!/usr/bin/env ruby
+require 'pathname'
+
+source_path = (Pathname.new(__FILE__).dirname + '../lib').expand_path
+$LOAD_PATH << source_path
+
+require 'pineapples'
+
+$terminal.indent_size = 2
+
+options = Pineapples::Parser.parse(ARGV)
+generator = Pineapples::AppGenerator.new(options)
+generator.start!

data/lib/pineapples.rb

@@ -5,12 +5,14 @@ require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/string/inflections'
 
 require 'English'
-#require 'erb'
 require 'fileutils'
 require 'ostruct'
+require 'open3'
 require 'optparse'
 require 'pathname'
+require 'pty'
 require 'securerandom'
+require 'shellwords'
 
 require 'pineapples/version'
 require 'pineapples/error'

data/lib/pineapples/actions.rb

@@ -4,6 +4,7 @@ require 'uri'
 require 'pineapples/actions/base/action'
 require 'pineapples/actions/base/target'
 require 'pineapples/actions/apply'
+require 'pineapples/actions/bundle'
 require 'pineapples/actions/chmod'
 require 'pineapples/actions/copy_file'
 require 'pineapples/actions/create_file'
@@ -114,6 +115,11 @@ module Pineapples
       say(output)
     end
 
+    def say_title(title)
+      puts
+      puts "== #{title} ==".light_yellow
+    end
+
     def indent(verbose = true, level_increment = 1)
       $terminal.indent_level += level_increment if verbose
       yield

data/lib/pineapples/actions/base/target.rb

@@ -1,134 +1,84 @@
 module Pineapples
   module Actions
     class Target
-      PASS_MATCH  = /!=(.*?)!/
-      GUARD_MATCH = /!(.*?)!/
-      EVAL_MATCH  = /%(.*?)%/
+      PASS_REGEX      = /!=(.*?)!/
+      GUARD_REGEX     = /!(.*?)!/
+      FILENAME_REGEX  = /%(.*?)%/
 
       attr_reader :given,
                   :fullpath,
                   :relative,
-                  :action
+                  :generator
 
-      def initialize(target, action)
+      def initialize(target, generator)
         raise Error, 'Target should not be falsy' if !target
 
-        @action = action
+        @generator = generator
         @given = target.to_s
 
-        evaluate_pass_method!
-        evaluate_guard_methods!
-        evaluate_filename_method!
+        match!
 
         @fullpath = File.expand_path(@given, generator.current_app_dir)
         @relative = generator.relative_to_current_app_dir(@fullpath)
       end
 
-      def generator
-        action.generator
-      end
-
       def skip?
-        @skip = false if @skip.nil?
         @skip
       end
 
       private
 
-      def evaluate_pass_method!
-        if pass_match
-          raise Error, methods_missing_error_message(pass_methods) if !generator_pass_method
-
-          @skip = !generator.send(generator_pass_method)
-          @given.gsub!(pass_match[0], '')
-        end
-      end
-
-      def evaluate_guard_methods!
-        if guard_match
-          raise Error, methods_missing_error_message(guard_methods) if !generator_guard_method
-
-          @skip = generator.send(generator_guard_method)
-          @given.gsub!(guard_match[0], '')
-        end
-      end
-
-      def evaluate_filename_method!
-        if eval_match
-          raise Error, methods_missing_error_message(filename_method) if !generator_filename_method
-
-          filename = generator.send(filename_method)
-          @given.gsub!(eval_match[0], filename)
-        end
-      end
-
-      def pass_match
-        PASS_MATCH.match(@given)
-      end
-
-      def guard_match
-        GUARD_MATCH.match(@given)
-      end
-
-      def eval_match
-        EVAL_MATCH.match(@given)
-      end
-
-      def generator_pass_method
-        if @pass_method.nil?
-          pass_methods.each do |method|
-            if generator.respond_to?(method, true)
-              @pass_method = method
-              break
+      def match!
+        loop do
+          matched = false
+          [:pass, :guard, :filename].each do |type|
+            if match(type)
+              send(:"evaluate_#{type}_method!")
+              matched = true and break
             end
           end
+          break if !matched || @skip
         end
-        @pass_method = false if @pass_method.nil?
-        @pass_method
       end
 
-      def generator_guard_method
-        if @guard_method.nil?
-          guard_methods.each do |method|
-            if generator.respond_to?(method, true)
-              @guard_method = method
-              break
-            end
-          end
-        end
-        @guard_method = false if @guard_method.nil?
-        @guard_method
+      def evaluate_pass_method!
+        method = find_generator_method!(methods_to_find(:pass))
+        @skip = !generator.send(method)
+        @given.sub!(match(:pass)[0], '')
       end
 
-      def generator_filename_method
-        if @filename_method.nil?
-          @filename_method = generator.respond_to?(filename_method, true) ? filename_method : false
-        end
-        @filename_method
+      def evaluate_guard_method!
+        method = find_generator_method!(methods_to_find(:guard))
+        @skip = generator.send(method)
+        @given.sub!(match(:guard)[0], '')
+      end
+
+      def evaluate_filename_method!
+        method = find_generator_method!(methods_to_find(:filename))
+        filename = generator.send(method)
+        @given.sub!(match(:filename)[0], filename)
       end
 
-      def guard_methods
-        guard_method = guard_match[1].strip
-        predicate_method = guard_method + '?'
-        [guard_method, predicate_method]
+      def match(type)
+        regexp = self.class.const_get(type.to_s.upcase + '_REGEX')
+        regexp.match(@given)
       end
 
-      def pass_methods
-        pass_method = pass_match[1].strip
-        predicate_method = pass_method + '?'
-        [pass_method, predicate_method]
+      def methods_to_find(type)
+        method = match(type)[1].strip
+        type == :filename ? method : [method, method + '?']
       end
 
-      def filename_method
-        eval_match[1].strip
+      def find_generator_method!(methods)
+        Array(methods).each { |method| return method if generator.respond_to?(method, true) }
+        raise Error, methods_missing_error_message(methods)
       end
 
       def methods_missing_error_message(methods)
-        plural = methods.is_a?(Array)
-        methods = methods.join(', ') if plural
-        methods_message = plural ? 'methods' : 'method'
+        methods = Array(methods)
+        methods_message = methods.length > 1 ? 'methods' : 'method'
 
-        "No instance #{methods_message} #{methods} for AppGenerator, can't evaluate filepath #{given}"
+        "No instance #{methods_message} #{methods.join(', ')} for AppGenerator, can't evaluate filepath #{given}"
       end
     end
 

data/lib/pineapples/actions/bundle.rb

@@ -0,0 +1,16 @@
+module Pineapples
+  module Actions
+    def bundle(command, options = {})
+      command = "#{command.first.first} #{command.first.last}" if command.is_a?(Hash)
+      say_status :bundle, "#{command}"
+
+      _bundle_command = Gem.bin_path('bundler', 'bundle')
+
+      require 'bundler'
+      Bundler.with_clean_env do
+        output = `"#{Gem.ruby}" "#{_bundle_command}" #{command} #{subcommands}`
+        print output if !options[:quiet]
+      end
+    end
+  end
+end

data/lib/pineapples/actions/chmod.rb

@@ -18,11 +18,12 @@ module Pineapples
       execute = !options.fetch(:pretend, pretend?)
       color   = options.fetch(:color, DEFAULT_COLOR)
 
-      relative_path = relative_to_app_root(File.join(app_root, path))
+      full_path = File.join(app_root, path)
+      relative_path = relative_to_app_root(full_path)
 
       say_status(:chmod, relative_path, color, verbose)
 
-      FileUtils.chmod_R(mode, path) if execute
+      FileUtils.chmod_R(mode, full_path) if execute
     end
   end
 end

data/lib/pineapples/actions/copy_file.rb

@@ -39,7 +39,7 @@ module Pineapples
         super
         if options[:mode] == :preserve
           mode = File.stat(source).mode
-          generator.chmod(target, mode, options)
+          generator.chmod(target.fullpath, mode, options)
         end
       end
 

data/lib/pineapples/actions/empty_directory.rb

@@ -25,7 +25,7 @@ module Pineapples
       def initialize(generator, target, options = {})
         super(generator, options)
 
-        @target = Target.new(target, self)
+        @target = Target.new(target, generator)
         @skip = @target.skip?
       end
 

data/lib/pineapples/actions/gsub_file.rb

@@ -23,13 +23,15 @@ module Pineapples
       verbose = options.fetch(:verbose, verbose?)
       execute = options.fetch(:pretend, execute?)
 
-      path = File.expand_path(path, app_root)
+      fullpath = File.expand_path(path, app_root)
+      raise Error, "File #{path} doesn't exist!" if !File.exist?(fullpath)
+
       say_status :gsub, relative_to_app_root(path), :light_yellow, verbose
 
       if execute
-        content = File.binread(path)
+        content = File.binread(fullpath)
         content.gsub!(flag, *args, &block)
-        File.open(path, 'wb') { |file| file.write(content) }
+        File.open(fullpath, 'wb') { |file| file.write(content) }
       end
     end
   end

data/lib/pineapples/actions/inside.rb

@@ -50,9 +50,13 @@ module Pineapples
       inside(:root, options) { yield }
     end
 
+    def in_app_root(&block)
+      Dir.chdir(app_root, &block)
+    end
+
     private
 
-    # helper method to abstract directory stack management in the "inside" action
+    # helper method to abstract directory stack management in the #inside action
     def with_directory(dir)
       not_in_root = (dir != :root)
 

data/lib/pineapples/actions/rails/erb_converters.rb

@@ -5,15 +5,20 @@ module Pineapples
         recursive = options.fetch(:recursive, true)
         verbose = options.fetch(:verbose, verbose?)
         execute = !options.fetch(:pretend, pretend?)
+        preserve = options.fetch(:keep_old_files, false)
 
         description = 'Convert ERB views to HAML'
-        say_action(:erb2haml, description, verbose)
+        say_status(:erb2haml, description, verbose)
 
         if execute
           target_path = File.expand_path(target, app_root)
-          target_path = File.join(target_path, recursive_mask) if recursive
+          target_path = File.join(target_path, '**') if recursive
           shell "find #{target_path} -name \\*.erb -print | sed 'p;s/.erb$/.haml/' | xargs -n2 html2haml",
                  verbose: false
+          if !preserve
+            erb_pattern = File.join(target_path, '*.erb')
+            Dir.glob(erb_pattern).each { |file| ::FileUtils.rm_f(file) }
+          end
         end
       end
 
@@ -21,17 +26,19 @@ module Pineapples
         recursive = options.fetch(:recursive, true)
         verbose = options.fetch(:verbose, verbose?)
         execute = !options.fetch(:pretend, pretend?)
+        preserve = options.falsetch(:keep_old_files, false)
 
         description = 'Convert ERB views to SLIM'
-        say_action(:erb2slim, description, verbose)
+        say_status(:erb2slim, description, verbose)
 
         if execute
           erb2haml(target, options)
           target_path = File.expand_path(target, app_root)
           target_path = File.join(target_path, '**') if recursive
-          shell "haml2slim #{target_path} --delete --trace", verbose: false
+          shell "haml2slim #{target_path} #{preserve ? '' : '--delete'} --trace", verbose: false
         end
       end
+
     end
   end
 end

data/lib/pineapples/actions/rails/new_hash_syntax_converter.rb

@@ -0,0 +1,36 @@
+module Pineapples
+  module Actions
+    FILE_WITH_RUBY_CODE = '.rb|.erb|.haml|.slim|.rake'
+    def convert_directory_to_new_hash_syntax(target, options = {})
+      recursive = options.delete(:recursive) || true
+
+      target_fullpath = File.expand_path(target, app_root)
+      target_fullpath = File.join(target_fullpath, '**') if recursive
+
+      excluded_files = Array(options[:exclude])
+      exclude_pattern = options[:exclude_pattern]
+
+      files = Dir.glob(target_fullpath, File::FNM_DOTMATCH)
+      files.sort.each do |file|
+        next if File.directory?(file)
+        next if exclude_pattern && file.match(exclude_pattern)
+        next if excluded_files.any? do |excluded_file|
+          File.basename(excluded_file) == File.basename(file_source)
+        end
+
+        case file
+        when /#{FILE_WITH_RUBY_CODE}$/
+          convert_file_to_new_hash_syntax(file)
+        end
+      end
+
+    end
+    # Converts file to new Ruby hash syntax, cause that is what I prefer
+    # Existing solutions on web usually use perl and shell, but we have
+    # power of Ruby and cool gsub_file action at our disposal!
+    def convert_file_to_new_hash_syntax(path)
+      regex = /:(\w+)(\s{1})(\s*)=>/
+      gsub_file(path, regex, '\1:\3')
+    end
+  end
+end

data/lib/pineapples/actions/rails/rails.rb

@@ -1,5 +1,6 @@
 require_relative 'erb_converters'
 require_relative 'copy_migration'
+require_relative 'new_hash_syntax_converter'
 
 module Pineapples
   module Actions

data/lib/pineapples/actions/remove_file.rb

@@ -1,28 +1,28 @@
-module Pineapples
-  module Actions
-    # Removes a file at the given location.
-    #
-    # ==== Parameters
-    # path<String>:: path of the file to be changed
-    # options<Hash>:: give :verbose => false to not log the status.
-    #
-    # ==== Example
-    #
-    #   remove_file 'README'
-    #   remove_file 'app/controllers/application_controller.rb'
-    #
-    def remove_file(path, options = {})
-      return unless behaviour == :invoke
-      path  = File.expand_path(path, destination_root)
-
-      message = relative_to_app_root(path)
-      verbose = options.fetch(:verbose, verbose?)
-      color = options.fetch(:color, :light_red)
-      execute = options[:pretend] || execute?
-
-      say_status :remove, message, color, verbose
-      ::FileUtils.rm_rf(path) if execute && File.exist?(path)
-    end
-    alias_method :remove_dir, :remove_file
-  end
-end
+module Pineapples
+  module Actions
+    # Removes a file at the given location.
+    #
+    # ==== Parameters
+    # path<String>:: path of the file to be changed
+    # options<Hash>:: give :verbose => false to not log the status.
+    #
+    # ==== Example
+    #
+    #   remove_file 'README'
+    #   remove_file 'app/controllers/application_controller.rb'
+    #
+    def remove_file(path, options = {})
+      return unless behaviour == :invoke
+      path  = File.expand_path(path, app_root)
+
+      message = relative_to_app_root(path)
+      verbose = options.fetch(:verbose, verbose?)
+      color = options.fetch(:color, :light_red)
+      execute = options[:pretend] || execute?
+
+      say_status :remove, message, color, verbose
+      ::FileUtils.rm_rf(path) if execute && File.exist?(path)
+    end
+    alias_method :remove_dir, :remove_file
+  end
+end