localtower 0.2.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 173cfbbb7586b74e2b52c7a2cf17afe58627f545
-  data.tar.gz: 0b4089ec63d56ec6adecbd359001f82255747217
+SHA256:
+  metadata.gz: 6f62130e44cf4f1047a87b4ab0bed7cd6821d00a7a0767320644d9e78120bba4
+  data.tar.gz: a6c3f44be4d00e2b159170254e8f4424d3ae95e5d4ac0645e8aaffbb882178a6
 SHA512:
-  metadata.gz: 4206e0c4968ee79a9655fda1325e351d270dde98acc59902bd3c4c91b3e848719d5323b75f3b92ca3f536a35f3e2133c44cd8e9f5bfe38753fb6ae3dd54e3739
-  data.tar.gz: 2deb5b2e2459e1c8e0edf56d8886f145af525a89194b23879a3f9cf62738947359f0af27619a22212fae987675a6b3e46a642da043b295e8af855018a710f551
+  metadata.gz: fd0523f501766384f7e9a2013e7d0b2256443de640aa627b1513d8c8bca3269627d28fbba6db5c08a8f840deb3b2854dc364772681408cdfcefe86b4e87d9256
+  data.tar.gz: e1a6e0c03d83e3f12acf2e1acf617e92c0a2f4e365479b8984ad016e3f196eb77fa916378cf02d17196689fe27ed16f14333e8832ac456baa2b9469930dd5b37

data/README.md

@@ -14,11 +14,12 @@
 ### Create a migration
 ![Migrations](https://raw.githubusercontent.com/damln/localtower/master/public/screenshots/v0.1.6/4_migrations.png)
 
+### Using the Capture plugin
+![Capture](https://raw.githubusercontent.com/damln/localtower/master/public/screenshots/v0.1.6/5_capture.png)
 
 ## INSTALL
 
-Only tested with Rails 4.2 and Rails 5.1 (should work with any Rails 4.2+ application).
-Only tested with PostgreSQL.
+Only tested with Rails 4.2 and Rails 5.1 (should work with any Rails 4.2+ application). Only tested with PostgreSQL.
 
 Add to your `Gemfile` file:
 ```ruby
@@ -42,7 +43,7 @@ bundle install
 Add to your `config/routes.rb`:
 ```ruby
 MyApp::Application.routes.draw do
-  if Rails.env.development?
+  if Rails.env.development? and defined?(Localtower)
     mount Localtower::Engine, at: "localtower"
   end
 
@@ -63,12 +64,14 @@ You can put this line anywhere in your code:
 
 For example:
 
-    def my_method
-      user = User.find(1)
-      some_data = {foo: "bar"}
+```ruby
+def my_method
+  user = User.find(1)
+  some_data = {foo: "bar"}
 
-      Localtower::Plugins::Capture.new(self, binding).save
-    end
+  Localtower::Plugins::Capture.new(self, binding).save
+end
+```
 
 Then go to the Localtower intercave here: [http://localhost:3000/localtower/logs](http://localhost:3000/localtower/logs) and you will see the variables `user` and `some_data` in the UI.
 
@@ -105,6 +108,6 @@ Thanks for reporting issues, I'll do my best.
 
 ## Deploy
 
-    rm *.gem | gem build localtower.gemspec | gem push localtower*.gem
+    rm *.gem | gem build localtower.gemspec && gem push localtower-*.gem
 
 

data/app/controllers/localtower/pages_controller.rb

@@ -10,6 +10,23 @@ module Localtower
       @logs = Localtower::Plugins::Capture.new.logs
     end
 
+    def log
+      file = Dir["#{Localtower::Plugins::Capture::LOG_PATH.call}/localtower*#{params[:md5]}*"][0]
+
+      render json: JSON.parse(open(file).read)
+    end
+
+    def log_var
+      answer = {}
+
+      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
     end

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

@@ -14,53 +14,67 @@
     border: 1px solid #cacaca;
     line-height: 1.2em;
     overflow:auto;
+    max-height: 800px;
+    max-width: 800px;
     -moz-background-clip: padding;
     -webkit-background-clip: padding-box;
     background-clip: padding-box;
     background-color: #FAFAFB;
     color: #393939;
     margin: 0px;
-    max-width: 800px;
     display: block;
   }
-
 </style>
-
-
-
 <% content_for :title do %>Logs<% end %>
-
 <div class="row">
   <div class="col-md-12">
     <div class="card">
       <div class="header">
-        <h4 class="title"></h4>
+        <h4 class="title">
+          <pre>Localtower::Plugins::Capture.new(self, binding).save</pre>
+        </h4>
       </div>
-
       <div class="content">
         <table class="table">
           <thead>
-            <th>Variable</th>
-            <th>Value</th>
-            <th>Value Type</th>
+            <th>TYPE</th>
+            <th>IN CLASS</th>
+            <th>IN METHOD</th>
+            <th>VARIABLE</th>
+            <th>VALUE</th>
           </thead>
-
-          <tbody data-selector="tbody">
-            <% @logs["variables"].each do |item| %>
-
-              <tr data-selector="tr">
-                <td class="code">
-                  <%= item["name"] %>
-                </td>
-
-                <td>
-                  <pre class="value json code"><%= Localtower::Plugins::Capture.printable(item["value"]) %></pre>
-                </td>
-
-                <td>
-                  <pre class="code"><%= item["klass"] %></pre>
-                </td>
-              </tr>
+          <tbody>
+            <% @logs.each do |log| %>
+              <% log["variables"].each do |item| %>
+                <tr>
+                  <td>
+                    <span class="label label-success">
+                      <%= item["type"] %>
+                    </span>
+                  </td>
+                  <td>
+                    <span>
+                      <a class="code" href="subl://open/?url=file://<%= item["meta"]["sublime_path"] %>">
+                        <%= item["meta"]["from_klass"] %>
+                      </a>
+                    </span>
+                  </td>
+                  <td>
+                    <span class="code">
+                      <%= item["meta"]["from_method"]  %>
+                    </span>
+                  </td>
+                  <td>
+                    <span class="code">
+                      <%= item["event_name"]  %>
+                    </span>
+                  </td>
+                  <td>
+                  <a href="<%= log_var_path(log["md5"], item["event_name"]) %>">open</a>
+                    <pre class="value json code"><%= Localtower::Plugins::Capture.printable(item["returned"]) %></pre>
+                  </td>
+                </tr>
+              <% end %>
             <% end %>
           </tbody>
         </table>

data/config/routes.rb

@@ -13,6 +13,8 @@ Localtower::Engine.routes.draw do
 
   get 'dashboard', to: 'pages#dashboard', as: 'dashboard'
   get 'logs', to: 'pages#logs', as: 'logs'
+  get 'logs/:md5', to: 'pages#log', as: 'log'
+  get 'logs/:md5/:var', to: 'pages#log_var', as: 'log_var'
 
   root :to => redirect('dashboard')
 end

data/lib/localtower/plugins/capture.rb

@@ -1,7 +1,8 @@
 module Localtower
   module Plugins
     class Capture
-      LOG_FILE = "#{Rails.root}/log/localtower_capture.log"
+      LOG_FILE = lambda { "#{Rails.root}/log/localtower_capture.log" }
+      LOG_PATH = lambda { "#{Rails.root}/log" }
       EXCLUDE_INSTANCE_VARIABLES = [
         "@_action_has_layout",
         "@_routes",
@@ -21,7 +22,6 @@ module Localtower
       class << self
         def printable(content)
           if content.respond_to?(:to_json)
-            # content.to_json
             JSON.pretty_generate(content)
           else
             content.to_s
@@ -42,24 +42,23 @@ module Localtower
       end
 
       def initialize(context = nil, context_binding = nil)
-        @context = context
-        @context_binding = context_binding
+        @context = context # self
+        @context_binding = context_binding # binding
       end
 
       def logs
-        if File.exist?(LOG_FILE)
-          content = File.open(LOG_FILE).read
-        else
-          content = nil
-        end
+        list = []
 
-        return {"variables" => []} if not content.present?
+        Dir["#{LOG_PATH.call}/localtower_capture_*.json"].each do |file|
+          json = JSON.parse(open(file).read)
+          list << json
+        end
 
-        data = JSON.parse(content)
+        list
       end
 
       def my_logger
-        @@my_logger ||= Logger.new(LOG_FILE)
+        @@my_logger ||= Logger.new(LOG_FILE.call)
         @@my_logger.formatter = proc do |severity, datetime, progname, msg|
           "#{msg}\n"
         end
@@ -70,16 +69,24 @@ module Localtower
       def values
         hash = {}
 
-        a = @context.send(:caller)[1] # xx/xx/app/controllers/clients/events_controller.rb:57:in `new'
+        callers = @context.send(:caller)
+        a = callers[1] # xx/xx/app/controllers/clients/events_controller.rb:57:in `new'
         a = a.split(Rails.root.to_s).last # events_controller.rb:57:in `new'
         a = a.split("\:")
 
+
         file = a[0].strip
         line_number = a[1].strip
         method = a[2].strip.gsub("in \`", "").gsub("\'", "")
 
+        sublime_path = "#{callers[1].split(":")[0]}:#{line_number}"
+
         hash["class"] = self.klass_name
-        hash["method"] = "#{file}##{method}:#{line_number}"
+        hash["file"] = "#{file}##{method}:#{line_number}"
+        hash["method"] = method
+        hash["md5"] = Digest::MD5.hexdigest(hash["file"])
+        hash["type"] = "CAPTURE_METHOD"
+        hash["time"] = Time.now.utc.strftime('%Y-%m-%d %H:%M:%S.%L')
 
         variables = []
 
@@ -89,19 +96,28 @@ module Localtower
           value = @context_binding.local_variable_get(var)
           klass = self.class.type_of(value)
 
-          variables << {
-            name: var,
-            value: value,
-            klass: klass
+          data = {
+            type: 'CAPTURE',
+            time: Time.now.utc.strftime('%Y-%m-%d %H:%M:%S.%L'),
+            event_name: var,
+            identifier: nil,
+            returned: value,
+            meta: {
+              from_klass: hash["class"],
+              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
+            }
           }
 
-          if value.is_a?(ActiveRecord::AssociationRelation) and value.respond_to?(:count)
-            variables << {
-              name: "#{var}_count",
-              value: value.count,
-              klass: nil
-            }
-          end
+          variables << data
         end
 
         @context.instance_variables.each do |var|
@@ -110,19 +126,28 @@ module Localtower
           value = @context.instance_variable_get(var.to_sym)
           klass = self.class.type_of(value)
 
-          variables << {
-            name: var,
-            value: value,
-            klass: klass
+          data = {
+            type: 'CAPTURE',
+            time: Time.now.utc.strftime('%Y-%m-%d %H:%M:%S.%L'),
+            event_name: var,
+            identifier: nil,
+            returned: value,
+            meta: {
+              from_klass: hash["class"],
+              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
+            }
           }
 
-          if value.is_a?(ActiveRecord::AssociationRelation) and value.respond_to?(:count)
-            variables << {
-              name: "#{var}_count",
-              value: value.count,
-              klass: nil
-            }
-          end
+          variables << data
         end
 
         hash["variables"] = variables
@@ -140,25 +165,25 @@ module Localtower
         value.to_s
       end
 
-      # def context_caller
-      #   @context.send(:caller)[0]
-      # end
-
-      def init
-        # Clear the logs
-        if File.exist?(LOG_FILE)
-          File.open(LOG_FILE, 'w') { |f| f.write("") }
+      def clear
+        Dir["#{LOG_PATH.call}/localtower_capture_*.json"].each do |file|
+          File.delete(file)
         end
 
         self
       end
 
       def save
+        # We don't want to save logs in production:
         return nil if Rails.env.production?
 
-        self.init
-        json = self.values.to_json
-        log "#{json}\n"
+        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) }
       end
 
       def log(str)

data/lib/localtower/tools.rb

@@ -154,7 +154,7 @@ module Localtower
       def perform_raw_cmd(cmd_str, standalone = false, root_dir = false)
         root_dir ||= ::Rails.root
 
-        cmd = standalone ? cmd_str : "cd '#{root_dir}' && #{cmd_str}"
+        cmd = standalone ? cmd_str : "cd \"#{root_dir}\" && #{cmd_str}"
         cmd = cmd.strip
 
         self.log("DOING...: #{cmd}")

data/lib/localtower/version.rb

@@ -1,3 +1,3 @@
 module Localtower
-  VERSION = '0.2.2'.freeze
+  VERSION = '0.4.0'.freeze
 end

data/spec/dummy/Gemfile

@@ -1,32 +1,12 @@
 source 'https://rubygems.org'
 
-git_source(:github) do |repo_name|
-  repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
-  "https://github.com/#{repo_name}.git"
-end
-
-gem 'rails', '>= 5.1.0'
-# gem 'rails', '>= 5.0.1'
+gem 'rails', '5.2.0'
 gem 'pg'
 gem 'puma'
-gem 'sass-rails', '~> 5.0'
-gem 'uglifier', '>= 1.3.0'
-gem 'coffee-rails', '~> 4.2'
-# See https://github.com/rails/execjs#readme for more supported runtimes
-# gem 'therubyracer', platforms: :ruby
-
 gem 'jquery-rails'
 gem 'turbolinks', '~> 5'
 
 group :development, :test do
-  # Access an IRB console on exception pages or by using <%= console %> anywhere in the code.
-  gem 'listen', '~> 3.0.5'
-  gem "dotenv-rails"
-  gem "better_errors"
-  gem "binding_of_caller"
-  gem 'require_reloader'
-  gem 'pry'
-
   localtower_path = File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))
   gem "localtower", path: localtower_path
 end