localtower 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 775afdc803d752a87109e8942ff71d1e7829ea59f19234933c477aff3956b7c3
-  data.tar.gz: 0d856ca281329b65d2cd9c82836077e1cfdd4f6b35625ade9b118628b00c065b
+  metadata.gz: 6eca3e0577b9e6f78d4982d046a3cba50519ee9eddc87367e6f04ce0abe77134
+  data.tar.gz: 7df1c8a2b27f095c840cab877023b9920290795d4b257e8c51ce0cff5730d484
 SHA512:
-  metadata.gz: 3bf27bfb43dc6a7428efa4279d832407749e576877d9813ab0c5c615374558a30617167952f170a2e48e4dda8e893a8871f357bf2c87ae7160a884e6d96dfbf7
-  data.tar.gz: e908d290a06fb7493b547b4bb4c3d1ea8a2538d5b13992748b9f41c189104658531d446118e95703106003217ae7a4870e08f92d23d979a344381370501f8107
+  metadata.gz: e8a389075ad641b51eddf4b41ef0a16b49ba8761c09e696edb94832e5b69896fbe051f8458110761e9767979a276e566c04fe162a6fedec6b5487158a3680802
+  data.tar.gz: 5b05a0e034ae8c636ccc514423e4434583568440785295963da345cf30a414e4fac11462d39c8fede9e3420e913d8dd02808688e6dd19c2160f7dfd2583ffae8

data/README.md

@@ -2,6 +2,14 @@
 <img src="https://raw.githubusercontent.com/damln/localtower/master/public/logo-localtower-white-300.png" alt="Localtower">
 </p>
 
+## Intro
+
+Update in 2022, please use localtower version `>= 0.4.1`
+See installation process below.
+Compatibility:
+- Rails >= 5.2
+- Ruby >= 2.3
+
 ### See the schema
 ![Schema](https://raw.githubusercontent.com/damln/localtower/master/public/screenshots/v0.1.6/1_schema.png)
 
@@ -24,7 +32,7 @@ Only tested with Rails 4.2 and Rails 5.1 (should work with any Rails 4.2+ applic
 Add to your `Gemfile` file:
 ```ruby
 group :development do
-  gem "localtower"
+  gem "localtower", ">= 0.4.1"
 end
 ```
 
@@ -60,7 +68,9 @@ Open your browser at [http://localhost:3000/localtower](http://localhost:3000/lo
 
 You can put this line anywhere in your code:
 
-    Localtower::Plugins::Capture.new(self, binding).save
+```ruby
+Localtower::Plugins::Capture.new(self, binding).save
+```
 
 For example:
 
@@ -79,7 +89,7 @@ Then go to the Localtower intercave here: [http://localhost:3000/localtower/logs
 
 The value for each variable will try to call `.to_json`. If you have a huge collection of models likes `@users` you will see all the collection as an Array.
 
-## RSpec and Contribute
+## Run test
 
 If you want to contribute to the gem:
 
@@ -96,18 +106,22 @@ bundle install
 bundle exec rspec spec/
 ```
 
-Notes:
-Tests are currently very slow because this is testing rails commands so it boots the framework for each test. Zeus or spring should be introduced.
-
 ## Contribute
 
-Thanks for reporting issues, I'll do my best.
+Thanks for reporting issues, I'll do my best 💪
 
 [![Analytics](https://ga-beacon.appspot.com/UA-93841935-1/github-readme?pixel)](https://github.com/damln/localtower)
 
 
 ## Deploy
+Only for official contributors.
 
     rm *.gem | gem build localtower.gemspec && gem push localtower-*.gem
 
+## Notes
+
+Do not hesitate to open issues if you have troubles using the gem.
+
+- By Damian Le Nouaille Diez: https://damln.com
+- Link on RubyGems: https://rubygems.org/gems/localtower
 

data/app/controllers/localtower/pages_controller.rb

@@ -11,32 +11,25 @@ module Localtower
     end
 
     def log
-      file = Dir["#{Localtower::Plugins::Capture::LOG_PATH.call}/localtower*#{params[:md5]}*"][0]
+      file_content = Localtower::Plugins::Capture.log_from_md5(clean_params['md5'])
 
-      render json: JSON.parse(open(file).read)
+      render json: file_content
     end
 
     def log_var
-      answer = {}
+      file_content = Localtower::Plugins::Capture.log_from_md5(clean_params['md5'])
+      returned = file_content["variables"].select {|i| i["event_name"] == clean_params[:var] }[0]["returned"]
 
-      file = Dir["#{Localtower::Plugins::Capture::LOG_PATH.call}/localtower*#{params[:md5]}*"][0]
-      data = JSON.parse(open(file).read)
-
-      answer = data["variables"].select {|i| i["event_name"] == params[:var] }[0]["returned"]
-
-      render json: answer
-    end
-
-    def status
-      @data = ::Localtower::Status.new.run
+      render json: returned
     end
 
     def migrations
+      @migrations = ::Localtower::Status.new.run
     end
 
     def post_migrations
       # Because we have a list or a field, take the item from the list in priority
-      params[:migrations][:migrations] = params[:migrations][:migrations].map do |action_line|
+      clean_params["migrations"]["migrations"] = clean_params["migrations"]["migrations"].map do |action_line|
         action_line["new_column_type"] = action_line["column_type"]
 
         if action_line["column"].present?
@@ -52,23 +45,34 @@ module Localtower
         action_line
       end
 
-      use_generator(::Localtower::Generators::Migration, params[:migrations])
+      use_generator(::Localtower::Generators::Migration, clean_params["migrations"])
       redirect_to migrations_path
     end
 
     def relations
+      @need_models = ::Localtower::Tools.enought_models_for_relation?
     end
 
     def post_relations
-      use_generator(::Localtower::Generators::Relation, params[:relations])
+      use_generator(::Localtower::Generators::Relation, clean_params["relations"])
       redirect_to relations_path
     end
 
+    # def tasks
+    #   @tasks = ['rake db:migrate RAILS_ENV=test']
+    # end
+
+    # def post_tasks
+    #   ::Localtower::Tools.perform_cmd(clean_params["task"]["name"], false)
+
+    #   redirect_to tasks_path
+    # end
+
     def models
     end
 
     def post_models
-      use_generator(::Localtower::Generators::Model, params[:models])
+      use_generator(::Localtower::Generators::Model, clean_params["models"])
       redirect_to relations_path
     end
 
@@ -78,5 +82,8 @@ module Localtower
       generator_klass.new(options).run
     end
 
+    def clean_params
+      params.permit!.to_hash.with_indifferent_access
+    end
   end
 end

data/app/helpers/localtower/application_helper.rb

@@ -7,7 +7,13 @@ module Localtower
       else
         str = name
       end
-      link_to str, "subl://open/?url=file://#{file}"
+
+      link_to str, file_link(file)
+    end
+
+    def file_link(file)
+      "vscode://file/#{file}"
+      # "vscode://open?url=file://#{file}&line=1"
     end
 
     def to_json_print(hash)

data/app/views/layouts/localtower/application.html.erb

@@ -62,16 +62,6 @@
                 <p>Logs</p>
               </a>
             </li>
-
-            <!--
-            <li class="<%= is_active_link?(status_path, :inclusive) ? "active" : nil %>">
-              <a href="<%= status_path %>">
-                <i class=""></i>
-                <p>Status</p>
-              </a>
-            </li>
-            -->
-
           </ul>
         </div>
       </div>

data/app/views/localtower/pages/logs.html.erb

@@ -54,14 +54,14 @@
                   </td>
                   <td>
                     <span>
-                      <a class="code" href="subl://open/?url=file://<%= item["meta"]["sublime_path"] %>">
+                      <a class="code" href="<%= file_link(item["meta"]["sublime_path"]) %>">
                         <%= item["meta"]["from_klass"] %>
                       </a>
                     </span>
                   </td>
                   <td>
                     <span class="code">
-                      <%= item["meta"]["from_method"]  %>
+                      def <%= item["meta"]["from_method"] %>()
                     </span>
                   </td>
                   <td>

data/app/views/localtower/pages/migrations.html.erb

@@ -79,10 +79,6 @@
         <!-- multiple lines: -->
         <div class="row">
           <div class="col-md-12 text-center">
-            <button name="migrations[run_migrate]" type="submit" value="false" class="btn btn-warning" data-selector="submit">
-            Create the migration
-            </button>
-
             <button name="migrations[run_migrate]" type="submit" value="true" class="btn btn-success" data-selector="submit">
             Create the migration and <b>migrate</b>
             </button>
@@ -91,5 +87,45 @@
         <% end %>
       </div>
     </div>
+
+    <div class="card">
+      <div class="header">
+        <h4 class="title">Migrations</h4>
+      </div>
+
+      <div class="content">
+        <table class="table">
+          <thead>
+          <tr>
+            <th>Name</th>
+            <th>Date</th>
+            <th>Status</th>
+          </tr>
+
+          </thead>
+          <tbody>
+            <% @migrations.each do |entry| %>
+            <%
+            klass = (entry["status"] == :done) ? "success" : "danger"
+            %>
+            <tr class="<%= klass %>">
+              <td>
+                <%= entry["name"] %>
+              </td>
+
+              <td>
+                <%= entry["time"] %>
+              </td>
+
+              <td>
+                <%= entry["status"] == :done ? 'done' : 'not executed' %>
+              </td>
+            </tr>
+            <% end %>
+          </tbody>
+        </table>
+      </div>
+
+    </div>
   </div>
 </div>

data/app/views/localtower/pages/models.html.erb

@@ -21,7 +21,7 @@
 
         <table class="table table-hover table-striped">
           <thead>
-            <th>Field</th>
+            <th>Column Name</th>
             <th>Type</th>
             <th>Default</th>
             <th>Index?</th>
@@ -66,10 +66,6 @@
         <!-- multiple lines: -->
         <div class="row">
           <div class="col-md-12 text-center">
-            <button name="models[run_migrate]" type="submit" value="false" class="btn btn-warning" data-selector="submit">
-            Create the model
-            </button>
-
             <button name="models[run_migrate]" type="submit" value="true" class="btn btn-success" data-selector="submit">
             Create the model and <b>migrate</b>
             </button>

data/app/views/localtower/pages/relations.html.erb

@@ -5,6 +5,12 @@
     <div class="card">
       <div class="header">
         <h4 class="title"></h4>
+
+        <% if not ::Localtower::Tools.enought_models_for_relation? %>
+        <div class="alert alert-danger text-center" role="alert">
+          <a href="#" class="alert-link">You need at least 2 models to create a relation.</a>
+        </div>
+        <% end %>
       </div>
 
       <div class="content">
@@ -15,7 +21,7 @@
             <div class="col-md-offset-4 col-sm-offset-3 col-md-4 col-sm-6">
               <div class="form-group">
                 <div class="text-center">
-                  <label>Name of the Model (optional)</label>
+                  <label>Name of the relation (optional, will use Rails conventions by default)</label>
                 </div>
                 <input type="text" name="relations[model_name]" class="form-control">
               </div>
@@ -47,10 +53,6 @@
 
         <div class="row">
           <div class="col-md-12 text-center">
-            <button name="relations[run_migrate]" type="submit" value="false" class="btn btn-warning" data-selector="submit">
-            Create the relation
-            </button>
-
             <button name="relations[run_migrate]" type="submit" value="true" class="btn btn-success" data-selector="submit">
             Create the relation and <b>migrate</b>
             </button>

data/app/views/localtower/pages/tasks.html.erb

@@ -0,0 +1,48 @@
+<% content_for :title do %>Tasks<% end %>
+
+<div class="row">
+  <div class="col-md-12">
+    <div class="card">
+      <div class="header">
+        <h4 class="title"></h4>
+      </div>
+      <div class="content">
+
+        <%= form_tag tasks_path, class: "form" do %>
+        <div class="row">
+          <div class="form-group">
+            <div class="col-md-12">
+              <div class="form-group">
+                <table class="table table-hover table-striped">
+                  <thead>
+                    <th>Task</th>
+                    <th></th>
+                  </thead>
+
+                  <tbody data-selector="tbody">
+                      <% @tasks.each do |task_str| %>
+                      <tr data-selector="tr">
+                        <td>
+                          <code>
+                            <%=task_str%>
+                          </code>
+                          <input type="hidden" name="task[name]" value="<%= task_str %>" class="form-control">
+                        </td>
+                        <td>
+                          <button name="" type="submit" class="btn btn-success" data-selector="submit">
+                          RUN
+                          </button>
+                        </td>
+                      </tr>
+                      <% end %>
+                  </tbody>
+                </table>
+              </div>
+            </div>
+          </div>
+        </div>
+        <% end %>
+      </div>
+    </div>
+  </div>
+</div>

data/config/routes.rb

@@ -8,7 +8,9 @@ Localtower::Engine.routes.draw do
   get "relations", to: "pages#relations", as: :relations
   post "relations", to: "pages#post_relations"
 
-  get "status", to: "pages#status", as: :status
+  # get "tasks", to: "pages#tasks", as: :tasks
+  # post "tasks", to: "pages#post_tasks"
+
   # get ':v/:asset', to: 'pages#asset_render', as: 'asset_render', :constraints => { :v => /[^\/]*/, :asset => /[^\/]*/ }
 
   get 'dashboard', to: 'pages#dashboard', as: 'dashboard'

data/lib/localtower/plugins/capture.rb

@@ -28,6 +28,11 @@ module Localtower
           end
         end
 
+        def log_from_md5(md5)
+          file = Dir["#{Localtower::Plugins::Capture::LOG_PATH.call}/localtower*#{md5}*"][0]
+          JSON.parse(open(file).read)
+        end
+
         def type_of(value)
           if value.instance_of?(Float); return Float.to_s; end;
           if value.instance_of?(Integer); return Integer.to_s; end;
@@ -82,7 +87,9 @@ module Localtower
         sublime_path = "#{callers[1].split(":")[0]}:#{line_number}"
 
         hash["class"] = self.klass_name
+        hash["file_name"] = file
         hash["file"] = "#{file}##{method}:#{line_number}"
+        hash["line_number"] = line_number
         hash["method"] = method
         hash["md5"] = Digest::MD5.hexdigest(hash["file"])
         hash["type"] = "CAPTURE_METHOD"
@@ -107,10 +114,7 @@ module Localtower
               from_method: hash["method"],
               klass: klass.to_s,
               method: method.to_s,
-              # arguments: data[:arguments],
               callers: callers,
-              # table_name: data[:table_name],
-              # sql: data[:sql],
               sublime_path: sublime_path,
               file: hash["file"],
               line: line_number
@@ -180,10 +184,9 @@ module Localtower
         self.clear
 
         data = self.values
-        json = data.to_json
         file = "#{LOG_PATH.call}/localtower_capture_#{data['md5']}.json"
 
-        File.open(file, 'w') { |f| f.write(json) }
+        File.open(file, 'w') { |f| f.write(data.to_json) }
       end
 
       def log(str)

data/lib/localtower/status.rb

@@ -7,24 +7,18 @@ module Localtower
         file_full_path.split("/")[-1]
       end
 
-      results = []
+      db_migrations = ActiveRecord::Base.connection.execute("select * from schema_migrations;").map { |e| e["version"].to_s }.sort.reverse
 
-      migrations = ActiveRecord::Base.connection.execute("select * from schema_migrations;").map { |e| e["version"].to_s }.sort.reverse
+      names.map do |name|
+        time = name.split("_")[0]
+        status = db_migrations.include?(time) ? :done : :todo
 
-      names.each do |name|
-        number = name.split("_")[0]
-
-        status = migrations.include?(number) ? 1 : 0
-
-        data = {
+        {
           "name" => name,
+          "time" => time,
           "status" => status,
         }
-
-        results << data
       end
-
-      results
     end
   end
 end

data/lib/localtower/tools.rb

@@ -14,15 +14,13 @@ module Localtower
     class << self
       def force_reload!
         app_folders = Dir["#{Rails.root}/app/models/**/*.rb"]
-        lib_folders = Dir["#{Rails.root}/lib/**/*.rb"]
-
-        all_folders = (app_folders + lib_folders).flatten
+        all_folders = (app_folders).flatten
 
         all_folders.each do |file|
           begin
-            ActiveSupport::Dependencies.require_or_load(file)
+            require file
           rescue Exception => e
-            puts "Error loading: #{file}"
+            puts "Error loading: #{file}, #{e.message}"
           end
         end
       end
@@ -31,7 +29,12 @@ module Localtower
         self.force_reload!
 
         root_klass = defined?(ApplicationRecord) ? ApplicationRecord : ActiveRecord::Base
-        root_klass.subclasses
+
+        root_klass.subclasses - [ActiveRecord::SchemaMigration]
+      end
+
+      def enought_models_for_relation?
+        models.size >= 2
       end
 
       def models_presented
@@ -124,31 +127,16 @@ module Localtower
         end
       end
 
-      def rails_project
-        Rails.root.to_s.split("/").last
-      end
-
       def perform_migration(str, standalone = false)
         self.perform_cmd("rails g migration #{str}", false)
 
         if not standalone
-          # self.perform_raw_cmd("z rake #{cmd_str}", standalone)
           self.perform_cmd('rake db:migrate')
-          # self.perform_cmd('rake db:migrate RAILS_ENV=test')
         end
       end
 
       def perform_cmd(cmd_str, standalone = true)
         self.perform_raw_cmd("bundle exec #{cmd_str}", standalone)
-
-        # if cmd_str["rake"]
-          # self.perform_raw_cmd("zeus #{cmd_str}", standalone)
-        # elsif cmd_str["rails g migration"]
-          # cmd = cmd_str.split("rails g migration")[1]
-          # self.perform_raw_cmd("zeus generate migration #{cmd}", standalone)
-        # else
-          # self.perform_raw_cmd("bundle exec #{cmd_str}", standalone)
-        # end
       end
 
       def perform_raw_cmd(cmd_str, standalone = false, root_dir = false)

data/lib/localtower/version.rb

@@ -1,3 +1,3 @@
 module Localtower
-  VERSION = '0.4.1'.freeze
+  VERSION = '0.4.2'.freeze
 end

data/public/css/app.css

@@ -23,6 +23,10 @@
   color: white;
 }
 
+.alert {
+  padding: 20px 30px;
+}
+
 .tower-a:hover{
   color: white;
 }

data/spec/dummy/Gemfile

@@ -1,6 +1,7 @@
 source 'https://rubygems.org'
 
-gem 'rails', '5.2.0'
+# gem 'rails', '5.2.0'
+gem "rails", "~> 7.0.1"
 gem 'pg'
 gem 'puma'
 gem 'jquery-rails'