rails-dev-tools 1.1.5 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 135b12a564b7385c03ecf9228ebaea81ad94462c0c6556b5f0af945499fdfd22
-  data.tar.gz: 25e0dc4891e7a77b4691e7ed143d79c3eb61e55f5626a0964cb561893db9dbdc
+  metadata.gz: 4ce0c42ebdc654a21469d5d30830635b057b24ae30e0ab896c5f3ee3228a91e1
+  data.tar.gz: 879c2b636fb11248292bd4b590a333d2345f1ecdea56a2eec0d117a5ccd18ae5
 SHA512:
-  metadata.gz: 1347f1fbaef506934cba6b1cf28b5e8ba9feb4ab3e6ff96216d45c614171443ef185844303436649aeb3e990eae4fce1996453c832bc3920978bdf2d8dda0c95
-  data.tar.gz: 5b06f3e21a1e9a9987e3a59915d250ecd8877565fb322ef73714112a5d9bc607682142d6429cc28f2870f4caf497a9677c229bdb2bf1ca6b5bf5770964e8ee2a
+  metadata.gz: '082868603a862fac9384bcca812a4197511ac5e7b43ce18de1b49e53925f228ab8038779ca589ab8e318d5ad2b376b974e9209342abb67c9fd05609e62c2db23'
+  data.tar.gz: c54b03489f773e88a69180bd196f7678284c6709bf7f066b86cc995ea9c5889b9f6a15f10e60b74b8d7b98870cecb3a823e0ef7b8ba7bc7de57051ef97e5a9da

data/lib/dev/executables/commands/pull.rb

@@ -19,7 +19,7 @@ module Dev
           apps.each do |current_app|
             @project.current_app = current_app
             if @project.valid_app?
-              @project.chdir_app
+              Dir.chdir @project.app_folder
               current_branch = `git rev-parse --abbrev-ref HEAD`
               
               print "Preparing to pull app "

data/lib/dev/executables/commands/push.rb

@@ -14,7 +14,7 @@ module Dev
           if app.present? and commit_message.present?
             @project.current_app = app
             if @project.valid_app?
-              @project.chdir_app
+              Dir.chdir @project.app_folder
               current_branch = `git rev-parse --abbrev-ref HEAD`
               
               print "Preparing to push app "

data/lib/dev/executables/commands/release.rb

@@ -106,11 +106,10 @@ module Dev
             print "√\n".green
             puts "\t\tDone. Output from git:".cadetblue
             puts "\t\t#{git_output.split("\n").map(&:squish).join("\n\t\t")}".cadetblue
-            puts
 
-            print "\tMerging hotfix on develop.."
+            print "\tMerging release on develop.."
             exec "git checkout develop"
-            exec "git merge --no-ff hotfix/#{version}"
+            exec "git merge --no-ff release/#{version}"
             git_output = exec "git push origin develop"
             if git_output.include?('fatal') or git_output.include?('rejected') or git_output.include?('error')
               print "X\n".red

data/lib/dev/executables/commands/status.rb

@@ -17,7 +17,7 @@ module Dev
           apps.each do |current_app|
             @project.current_app = current_app
             if @project.valid_app?
-              @project.chdir_app
+              Dir.chdir @project.app_folder
               current_branch = `git rev-parse --abbrev-ref HEAD`
 
               print "Status of app "

data/lib/dev/executables/commands/test.rb

@@ -26,7 +26,7 @@ module Dev
 
           tested_apps.each do |current_app|
             @project.current_app = current_app
-            @project.chdir_app
+            Dir.chdir @project.app_folder
 
             print "Eseguo test dell'app "
             print current_app.to_s.teal

data/lib/dev/project.rb

@@ -63,22 +63,22 @@ module Dev
     end
 
     ##
-    # Sposta la directory corrente nella cartella
+    # Ottiene la directory corrente nella cartella
     # dell'app specificata. Prende l'app corrente se non
     # viene specificata nessuna app.
     #
     # @param [String] app_name il nome dell'app.
     #
     # @return [nil]
-    def chdir_app(app_name = self.current_app)
+    def app_folder(app_name = self.current_app)
       if self.type == :multi
         if app_name.in? self.main_apps
-          Dir.chdir "#{self.folder}/main_apps/#{app_name}"
+          "#{self.folder}/main_apps/#{app_name}"
         elsif app_name.in? self.engines
-          Dir.chdir "#{self.folder}/engines/#{app_name}"
+          "#{self.folder}/engines/#{app_name}"
         end
       elsif self.type == :single
-        Dir.chdir self.folder
+        self.folder
       end
     end
 
@@ -90,7 +90,9 @@ module Dev
     #
     # @return [String] il file di versione dell'app.
     def app_version_file(app_name = self.current_app)
-      "lib/#{app_name}/version.rb"
+      Dir.glob("#{app_folder(app_name)}/lib/**/version.rb").min do |file_name|
+        file_name.chars.count
+      end
     end
 
     ##
@@ -102,8 +104,8 @@ module Dev
     # @return [String] la versione dell'app.
     def app_version(app_name = self.current_app)
       chdir_app(app_name)
-      if File.exists? "lib/#{app_name}/version.rb"
-        File.read("lib/#{app_name}/version.rb")
+      if File.exists? app_version_file(app_name).to_s
+        File.read(app_version_file(app_name))
           .match(/VERSION = '([0-9\.]+)'\n/)
           .try(:captures).try(:first)
       else

data/lib/dev/version.rb

@@ -1,3 +1,3 @@
 module Dev
-  VERSION = '1.1.5'
+  VERSION = '1.2.1'
 end

data/lib/generators/dev/config_generator.rb

@@ -10,7 +10,6 @@ module Dev
 
       def copy_config
         template "dev.yml.erb", "dev.yml" do |content|
-          puts content.inspect.magenta
           content
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails-dev-tools
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.2.1
 platform: ruby
 authors:
 - Francesco Ballardin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-10 00:00:00.000000000 Z
+date: 2018-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails