localtower 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6eca3e0577b9e6f78d4982d046a3cba50519ee9eddc87367e6f04ce0abe77134
-  data.tar.gz: 7df1c8a2b27f095c840cab877023b9920290795d4b257e8c51ce0cff5730d484
+  metadata.gz: 0f287a30405aef9188949f37fa3142997d91e188fa0d71db42ba550d47a73bc7
+  data.tar.gz: 9ba53f02eefe31b6f6f1901c2dc3b8a17461a72db8086fb2bd845ec7979fde7b
 SHA512:
-  metadata.gz: e8a389075ad641b51eddf4b41ef0a16b49ba8761c09e696edb94832e5b69896fbe051f8458110761e9767979a276e566c04fe162a6fedec6b5487158a3680802
-  data.tar.gz: 5b05a0e034ae8c636ccc514423e4434583568440785295963da345cf30a414e4fac11462d39c8fede9e3420e913d8dd02808688e6dd19c2160f7dfd2583ffae8
+  metadata.gz: 122fd3997f2540a5fe239cadf8790975c5d881ad85ed4f632f99d53f94719832404b8ce265844f9da00f21661425106c74a6423b608bbdcb649002af6d963789
+  data.tar.gz: 8f6c8eda883c0e0dc54f1b9b218cfbd41c5dc15c36ab8ec481ffe1e2c241cefa04714c3f468d0b47556dee5576a18e69b4e42e2c46ad52850ffbb54fb332f641

data/README.md

@@ -22,24 +22,15 @@ Compatibility:
 ### 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.
+Should work with any Rails 4.2+ application.
+Only tested with PostgreSQL.
 
 Add to your `Gemfile` file:
 ```ruby
 group :development do
-  gem "localtower", ">= 0.4.1"
-end
-```
-
-If you want the latest master branch, add to your `Gemfile` file following:
-```ruby
-group :development do
-  gem "localtower", github: "damln/localtower"
+  gem "localtower"
 end
 ```
 
@@ -60,34 +51,27 @@ MyApp::Application.routes.draw do
 end
 ```
 
-## Usage
-
-Open your browser at [http://localhost:3000/localtower](http://localhost:3000/localtower).
-
-## Logger Usage (Capture plugin)
-
-You can put this line anywhere in your code:
+/!\ IMPORTANT /!\
+Change your config/environments/development.rb:
 
 ```ruby
-Localtower::Plugins::Capture.new(self, binding).save
-```
+Rails.application.configure do
+  # ...
 
-For example:
+  # This is the default:
+  # config.active_record.migration_error = :page_load
 
-```ruby
-def my_method
-  user = User.find(1)
-  some_data = {foo: "bar"}
+  # Change it to:
+  config.active_record.migration_error = false if defined?(Localtower)
 
-  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.
+## Usage
 
-### Notes for the Capture plugin:
+Open your browser at [http://localhost:3000/localtower](http://localhost:3000/localtower).
 
-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.
 
 ## Run test
 
@@ -110,7 +94,7 @@ bundle exec rspec spec/
 
 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)
+![ga](https://www.google-analytics.com/collect?v=1&tid=G-1XG3EBE2DZ&cid=555&aip=1&t=event&ec=github&ea=visit&dp=readme&dt=gem)
 
 
 ## Deploy
@@ -124,4 +108,3 @@ 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

@@ -2,82 +2,53 @@ require_dependency 'localtower/application_controller'
 
 module Localtower
   class PagesController < ApplicationController
+    before_action :set_migrations, only: [:migrations, :models]
 
-    def dashboard
-    end
-
-    def logs
-      @logs = Localtower::Plugins::Capture.new.logs
-    end
-
-    def log
-      file_content = Localtower::Plugins::Capture.log_from_md5(clean_params['md5'])
-
-      render json: file_content
-    end
-
-    def log_var
-      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"]
-
-      render json: returned
+    def schema
     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
-      clean_params["migrations"]["migrations"] = clean_params["migrations"]["migrations"].map do |action_line|
+      migrations = clean_params["migrations"]["migrations"].map do |action_line|
+        # This is used for "rename_column" action:
         action_line["new_column_type"] = action_line["column_type"]
 
-        if action_line["column"].present?
-          action_line["column"] = action_line["column"]
-        end
-
         if action_line["column_list"].present?
           action_line["column"] = action_line["column_list"]
         end
 
         action_line.delete("column_list")
+        # / This is used for "rename_column" action
 
         action_line
       end
 
-      use_generator(::Localtower::Generators::Migration, clean_params["migrations"])
+      use_generator(::Localtower::Generators::Migration, { 'migrations' => 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, 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, clean_params["models"])
-      redirect_to relations_path
+      redirect_to models_path
+    end
+
+    def post_actions
+      ::Localtower::Tools.perform_cmd(clean_params['cmd'], false)
+      redirect_back fallback_location: root_path
     end
 
     private
 
+    def set_migrations
+      @migrations = ::Localtower::Status.new.run.select { |entry| entry['status'] == :todo }
+    end
+
     def use_generator(generator_klass, options)
       generator_klass.new(options).run
     end

data/app/helpers/localtower/application_helper.rb

@@ -1,25 +1,7 @@
 module Localtower
   module ApplicationHelper
-    def subl_link_to(name, file, &block)
-      name ||= file
-      if block_given?
-        str = capture(&block)
-      else
-        str = name
-      end
-
-      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)
-      # str = hash.to_json
-      # str.gsub(/,"/, ',<br>"').gsub(/\"\:/, '": ').html_safe
-      hash.to_json
     end
   end
 end

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

@@ -12,10 +12,10 @@
     <link rel="stylesheet" type="text/css" href="/light-bootstrap-dashboard-master/assets/css/light-bootstrap-dashboard.css">
 
     <!--     Fonts and icons     -->
-    <link href="http://maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.min.css" rel="stylesheet">
-    <link href='http://fonts.googleapis.com/css?family=Roboto:400,700,300' rel='stylesheet' type='text/css'>
+    <link href="/vendor/font-awesome.min.css" rel="stylesheet">
     <link rel="stylesheet" type="text/css" href="/light-bootstrap-dashboard-master/assets/css/pe-icon-7-stroke.css">
 
+    <link rel="stylesheet" type="text/css" href="/vendor/highlight-js-default.min.css">
     <link rel="stylesheet" type="text/css" href="/css/app.css">
 
     <%= csrf_meta_tags %>
@@ -28,8 +28,8 @@
 
         <div class="sidebar-wrapper">
           <ul class="nav">
-            <li class="<%= is_active_link?(dashboard_path, :inclusive) ? "active" : nil %>">
-              <a href="<%= dashboard_path %>">
+            <li class="<%= is_active_link?(schema_path, :inclusive) ? "active" : nil %>">
+              <a href="<%= schema_path %>">
                 <i class="pe-7s-home"></i>
                 <p>Schema</p>
               </a>
@@ -42,59 +42,16 @@
               </a>
             </li>
 
-            <li class="<%= is_active_link?(relations_path, :inclusive) ? "active" : nil %>">
-              <a href="<%= relations_path %>">
-                <i class="pe-7s-shuffle"></i>
-                <p>New Relation</p>
-              </a>
-            </li>
-
             <li class="<%= is_active_link?(migrations_path, :inclusive) ? "active" : nil %>">
               <a href="<%= migrations_path %>">
                 <i class="pe-7s-edit"></i>
                 <p>New Migration</p>
               </a>
             </li>
-
-            <li class="<%= is_active_link?(logs_path, :inclusive) ? "active" : nil %>">
-              <a href="<%= logs_path %>">
-                <i class="pe-7s-ticket"></i>
-                <p>Logs</p>
-              </a>
-            </li>
           </ul>
         </div>
       </div>
-      <div class="tower-nav">
-          <div class="<%= is_active_link?(dashboard_path, :inclusive) ? "active" : nil %>">
-              <a class="tower-a" href="<%= dashboard_path %>">
-                <i class="pe-7s-home"></i>
-                <p>Schema</p>
-              </a>
-            </div>
-
 
-            <div class="<%= is_active_link?(models_path, :inclusive) ? "active" : nil %>">
-              <a class="tower-a" href="<%= models_path %>">
-                <i class="pe-7s-server"></i>
-                <p>New Model</p>
-              </a>
-            </div>
-
-            <div class="<%= is_active_link?(relations_path, :inclusive) ? "active" : nil %>">
-              <a class="tower-a" href="<%= relations_path %>">
-                <i class="pe-7s-shuffle"></i>
-                <p>New Relation</p>
-              </a>
-            </div>
-
-            <div class="<%= is_active_link?(migrations_path, :inclusive) ? "active" : nil %>">
-              <a class="tower-a" href="<%= migrations_path %>">
-                <i class="pe-7s-edit"></i>
-                <p>New Migration</p>
-              </a>
-            </div>
-      </div>
 
       <div class="main-panel">
         <div class="content">
@@ -134,7 +91,8 @@
 
     <!-- Light Bootstrap Table Core javascript and methods for Demo purpose -->
     <script src="/light-bootstrap-dashboard-master/assets/js/light-bootstrap-dashboard.js"></script>
-    <script src="/js/masonry.pkgd.min.js"></script>
+    <script src="/vendor/highlight.min.js"></script>
+    <script src="/vendor/masonry.pkgd.min.js"></script>
     <script src="/js/app.js"></script>
   </body>
 </html>

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

@@ -0,0 +1,57 @@
+<div class="card">
+  <div class="header">
+    <div class="container-fluid">
+      <div class="row">
+        <div class="col-md-6"><h4 class="title">Pending migrations</h4></div>
+        <div class="col-md-6">
+          <div class="pull-right">
+          <% if migrations.any? %>
+          <%= form_tag actions_path, class: "form" do %>
+            <button name="cmd" type="submit" value="rails db:migrate" class="btn btn-warning" data-selector="submit">
+              Run Pending Migrations (<code>bundle exec rails db:migrate</code>)
+            </button>
+          <% end %>
+          <% end %>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <div class="content">
+  <% if migrations.any? %>
+    <% migrations.each do |entry| %>
+    <div class="container-fluid">
+      <div class="row">
+        <div class="col-md-8">
+            <h5 style="color: <%= entry['status'] == :todo ? 'red' : 'green' %>;">
+              <% if entry['status'] == :todo %>
+                <button type="button" class="btn btn-danger btn-xs">PENDING</button>
+              <% end %>
+
+              <a href="<%= file_link(entry['file_full_path']) %>"><%= entry['name'] %></a>
+            </h5>
+        </div>
+      </div>
+
+      <div class="row">
+        <div class="col-md-12">
+        <% if entry['status'] == :todo %>
+          <pre><code class="language-ruby"><%= entry['content'] %></code></pre>
+        <% end %>
+        </div>
+      </div>
+    </div>
+    <% end %>
+
+  <% else %>
+    <div class="container-fluid">
+      <div class="row">
+        <div class="col-md-8">
+          No pending migrations.
+        </div>
+      </div>
+    </div>
+  <% end %>
+  </div>
+</div>

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

@@ -76,11 +76,10 @@
 
         <hr>
 
-        <!-- multiple lines: -->
         <div class="row">
           <div class="col-md-12 text-center">
-            <button name="migrations[run_migrate]" type="submit" value="true" class="btn btn-success" data-selector="submit">
-            Create the migration and <b>migrate</b>
+            <button type="submit" value="true" class="btn btn-success" data-selector="submit">
+            Create the migration
             </button>
           </div>
         </div>
@@ -88,44 +87,6 @@
       </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>
+    <%= render partial: "migrations", locals: { migrations: @migrations } %>
   </div>
 </div>

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

@@ -14,7 +14,7 @@
           <div class="col-md-6">
             <div class="form-group">
               <label>Name of the Model</label>
-              <input type="text" name="models[model_name]" class="form-control">
+              <input type="text" data-sain name="models[model_name]" class="form-control">
             </div>
           </div>
         </div>
@@ -66,13 +66,15 @@
         <!-- multiple lines: -->
         <div class="row">
           <div class="col-md-12 text-center">
-            <button name="models[run_migrate]" type="submit" value="true" class="btn btn-success" data-selector="submit">
-            Create the model and <b>migrate</b>
+            <button type="submit" value="true" class="btn btn-success" data-selector="submit">
+            Create the model Only
             </button>
           </div>
         </div>
         <% end %>
       </div>
     </div>
+
+    <%= render partial: "migrations", locals: { migrations: @migrations } %>
   </div>
 </div>

data/config/routes.rb

@@ -1,22 +1,13 @@
 Localtower::Engine.routes.draw do
-  get "migrations", to: "pages#migrations", as: :migrations
-  post "migrations", to: "pages#post_migrations"
+  get 'migrations', to: 'pages#migrations', as: :migrations
+  post 'migrations', to: 'pages#post_migrations'
 
-  get "models", to: "pages#models", as: :models
-  post "models", to: "pages#post_models"
-
-  get "relations", to: "pages#relations", as: :relations
-  post "relations", to: "pages#post_relations"
-
-  # get "tasks", to: "pages#tasks", as: :tasks
-  # post "tasks", to: "pages#post_tasks"
+  get 'models', to: 'pages#models', as: :models
+  post 'models', to: 'pages#post_models'
 
   # get ':v/:asset', to: 'pages#asset_render', as: 'asset_render', :constraints => { :v => /[^\/]*/, :asset => /[^\/]*/ }
+  get 'schema', to: 'pages#schema', as: 'schema'
+  post 'actions', to: 'pages#post_actions', as: 'actions'
 
-  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')
+  root :to => redirect('models')
 end

data/lib/localtower/generators/migration.rb

@@ -5,9 +5,11 @@ module Localtower
       include Thor::Actions
 
       no_commands do
+        # data = {last_migration_file: "", column_type: "", table_name: "", column: "", nullable: true, index: true}
         def migration_add_column(data)
           file = data["last_migration_file"]
 
+          # Special case for array
           if %w(array).include?(data["column_type"])
             line  = "    add_column :#{data['table_name']}, :#{data['column']}, :text"
             line << ", default: []"
@@ -134,14 +136,12 @@ module Localtower
         'change_column_type',
         'add_index_to_column',
         'belongs_to',
-        # 'add_index_to_column_combined',
         'remove_index_to_column',
-        # 'create_table',
         'drop_table',
       ].freeze
 
       DEFAULTS = [
-        "true", "false", "nil"
+        "true", "false", "nil", "0"
       ]
 
       # @opts =
@@ -150,21 +150,12 @@ module Localtower
         @opts = JSON[opts.to_json]
       end
 
-      def remove_all_migrations
-        Dir["#{Rails.root}/db/migrate/*"].each { |migration_file| File.delete(migration_file) }
-
-        content_schema = """
-ActiveRecord::Schema.define(version: 0) do
-end
-        """
-
-        File.open("#{Rails.root}/db/schema.rb", "w") do |f|
-          f.write(content_schema)
-        end
-      end
-
+      # @opts['migrations'] = []
+      # @opts['run_migrate'] = true
       def run
-        cmd = "ChangeTheModel#{@opts['migration_name']}AtTime#{Time.now.to_i}"
+        model_names = @opts['migrations'].map { |line| line['table_name'].camelize }.join
+
+        cmd = "Change#{model_names}#{@opts['migration_name']}At#{Time.now.to_i}"
         ::Localtower::Tools.perform_migration(cmd, true)
 
         @opts['migrations'].each do |action_line|
@@ -188,7 +179,6 @@ end
             'change_column_type' => -> { change_column_type(action_line) },
             'add_index_to_column' => -> { add_index_to_column(action_line) },
             'belongs_to' => -> { belongs_to(action_line) },
-            # 'add_index_to_column_combined' => -> { add_index_to_column_combined(action_line) },
             'remove_index_to_column' => -> { remove_index_to_column(action_line) },
             'create_table' => -> { create_table(action_line) },
             'drop_table' => -> { drop_table(action_line) }
@@ -209,90 +199,41 @@ end
       private
 
       def add_column(data)
-        if not data["table_name"].present? \
-          or not data["column"].present? \
-          or not data["column_type"].present?
-          return nil
-        end
-
         @thor.migration_add_column(data)
       end
 
       def remove_column(data)
-        if not data["table_name"].present? \
-          or not data["column"].present?
-          return nil
-        end
-
         @thor.migration_remove_column(data)
       end
 
       def rename_column(data)
-        if not data["table_name"].present? \
-          or not data["column"].present? \
-          or not data["new_column_name"].present?
-          return nil
-        end
-
         @thor.migration_rename_column(data)
       end
 
       def change_column_type(data)
-        if not data["table_name"].present? \
-          or not data["column"].present? \
-          or not data["new_column_type"].present?
-          return nil
-        end
-
         @thor.migration_change_column_type(data)
       end
 
       def add_index_to_column(data)
-        if not data["table_name"].present? \
-          or not data["column"].present?
-          return nil
-        end
-
         @thor.migration_add_index_to_column(data)
       end
 
       def belongs_to(data)
-        if not data["table_name"].present? and data["belongs_to"].present?
-          return nil
-        end
-
         data["column"] = data["belongs_to"].underscore.singularize
         data['column_type'] = "references"
 
         @thor.migration_belongs_to(data)
       end
 
-      # def add_index_to_column_combined(data)
-      #   @thor.migration_add_index_to_column_combined(data)
-      # end
-
       def remove_index_to_column(data)
-        if not data["table_name"].present? \
-          or not data["column"].present?
-          return nil
-        end
-
         @thor.migration_remove_index_to_column(data)
       end
 
       def create_table(data)
-        if not data["table_name"].present?
-          return nil
-        end
-
         @thor.migration_create_table(data)
       end
 
       def drop_table(data)
-        if not data["table_name"].present?
-          return nil
-        end
-
         @thor.migration_drop_table(data)
       end