onotole 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 68a3157ab702129ca0c8d08a375737a13438f9a9
-  data.tar.gz: 0cd75e6d0032cdd98a9fef728f41de62c6f621a1
+  metadata.gz: 08a7392c01e8ebd00562b21c33132fe49465e53c
+  data.tar.gz: 69a1b4efe7fd922ed2709c6d96595b9c49116152
 SHA512:
-  metadata.gz: 3c9447a725d61a612fb3e197a455a8f95438e24ec36a4765cb6e9f234f3fdaa839053d224daf14989bb7d76011f7b39178edc7c62c465779ebadbc8f07de133c
-  data.tar.gz: e4d1fbd54f3c5da017a960cdcb80ff138d2079286475fed5d51cdc3495954c9531cd971a90bf140592d7da95d05d552b1bacbcebca612d7b63d1b7743dc828e7
+  metadata.gz: 92439b245ded6bba9120a66055718e51a82da194de97a0732502e78192380a4c47185dc37e49d65bebccf4308098bf2e418e48977a1d12f0affdcb91d85d8cf5
+  data.tar.gz: 87c5d12e56041d84f221f6fbf53f2de8a70e37878aedc581636023f82e60ae682c017ead237f6105bc0eee15ec2fa5dd8c960c3b3bc95edf7cc747fe4f875b83

data/Gemfile

@@ -1,4 +1,6 @@
 # frozen_string_literal: true
 source 'https://rubygems.org'
 
+gem 'rubycritic', require: false
+
 gemspec

data/README.md

@@ -80,6 +80,8 @@ creating elegant backends for website administration.
  * [Active_skin](https://github.com/rstgroup/active_skin) Flat skin for active admin.
  * [flattened_active_admin](https://github.com/Papercloud/flattened_active_admin) 
  Theme. Bring your Active Admin up-to-date with this customizable add on
+ * [Face_of_active_admin](https://github.com/kvokka/face_of_active_admin) Theme 
+ for ActiveAdmin with glyphicons and flattens
  * `*`[rubycritic](https://github.com/whitesmith/rubycritic) A Ruby code quality 
  reporter
  * [railroady](https://github.com/preston/railroady) Model and controller UML 

data/lib/onotole/add_user_gems/after_install_patch.rb

@@ -10,6 +10,11 @@ module Onotole
                        :annotate,
                        :overcommit,
                        :activeadmin,
+                       :active_admin_theme,
+                       :acive_skin,
+                       :flattened_active_admin,
+                       :face_of_active_admin,
+                       :active_admin_bootstrap,
                        :rails_admin,
                        :guard,
                        :guard_rubocop,
@@ -85,30 +90,6 @@ end
       inject_into_file(AppBuilder.js_file, "\n//= require bootstrap-sprockets",
                        after: '//= require jquery_ujs')
       copy_file 'bootstrap_flash_helper.rb', 'app/helpers/bootstrap_flash_helper.rb'
-      return unless user_choose? :activeadmin
-      if AppBuilder.active_admin_theme_selected
-
-        File.open('app/assets/stylesheets/active_admin.scss', 'a') do |f|
-          f.write "\n@import 'wigu/active_admin_theme';"
-        end if user_choose? :active_admin_theme
-
-        File.open('app/assets/stylesheets/active_admin.scss', 'a') do |f|
-          f.write "\n@import 'active_skin;'\n\\\\$skinLogo: url('admin_logo.png') no-repeat 0 0;"
-        end if user_choose? :active_skin
-        if user_choose? :flattened_active_admin
-          File.open('app/assets/stylesheets/active_admin.scss', 'w') do |f|
-            f.write "\n@import 'flattened_active_admin/variables;'
-            \n@import 'flattened_active_admin/mixins;'
-            \n@import 'flattened_active_admin/base;'"
-          end
-          rails_generator 'flattened_active_admin:variables'
-        end
-
-      else
-        copy_file 'admin_bootstrap.scss', 'vendor/assets/stylesheets/active_admin/admin_bootstrap.scss'
-        copy_file 'active_admin.scss', 'vendor/assets/stylesheets/active_admin.scss'
-        remove_file 'app/assets/stylesheets/active_admin.scss'
-      end
     end
 
     def after_install_bootstrap3
@@ -172,11 +153,6 @@ end
       rails_generator 'typus:views'
     end
 
-    def after_install_active_admin_theme
-      append_file('app/assets/stylesheets/active_admin.scss',
-                  "\n@import 'wigu/active_admin_theme';")
-    end
-
     def after_install_paper_trail
       rails_generator 'paper_trail:install'
     end
@@ -195,5 +171,49 @@ end
       append_file(AppBuilder.app_file_scss, "\n@import 'devise_bootstrap_views'")
       rails_generator 'devise:views:bootstrap_templates'
     end
+
+    def after_install_active_admin_bootstrap
+      return unless user_choose?(:bootstrap3_sass) || user_choose?(:activeadmin)
+      AppBuilder.use_asset_pipelline = false
+      copy_file 'admin_bootstrap.scss', 'vendor/assets/stylesheets/active_admin/admin_bootstrap.scss'
+      copy_file 'active_admin.scss', 'vendor/assets/stylesheets/active_admin.scss'
+      remove_file 'app/assets/stylesheets/active_admin.scss'
+    end
+
+    def after_install_active_admin_theme
+      return unless user_choose? :activeadmin
+      File.open('app/assets/stylesheets/active_admin.scss', 'a') do |f|
+        f.write "\n@import 'wigu/active_admin_theme';"
+      end
+    end
+
+    def after_install_acive_skin
+      return unless user_choose? :activeadmin
+      File.open('app/assets/stylesheets/active_admin.scss', 'a') do |f|
+        f.write "\n@import 'active_skin;'\n\\\\$skinLogo: url('admin_logo.png') no-repeat 0 0;"
+      end
+    end
+
+    def after_install_flattened_active_admin
+      return unless user_choose? :activeadmin
+      File.open('app/assets/stylesheets/active_admin.scss', 'w') do |f|
+        f.write "\n@import 'flattened_active_admin/variables;'
+        \n@import 'flattened_active_admin/mixins;'
+        \n@import 'flattened_active_admin/base;'"
+      end
+      rails_generator 'flattened_active_admin:variables'
+    end
+
+    def after_install_face_of_active_admin
+      return unless user_choose? :activeadmin
+      File.open('app/assets/stylesheets/active_admin.scss', 'w') do |f|
+        f.write "\n@import 'face_of_active_admin/variables;'
+        \n@import 'face_of_active_admin/mixins;'
+        \n@import 'face_of_active_admin/base;'"
+      end
+      append_file 'app/assets/javascripts/active_admin.js.coffee',
+                  "\n#= require face_of_active_admin/base"
+      rails_generator 'face_of_active_admin:variables'
+    end
   end
 end

data/lib/onotole/add_user_gems/before_bundle_patch.rb

@@ -252,5 +252,9 @@ module Onotole
     def add_axlsx_rails_gem
       inject_into_file('Gemfile', "\ngem 'axlsx_rails'", after: '# user_choice')
     end
+
+    def add_face_of_active_admin_gem
+      inject_into_file('Gemfile', "\ngem 'face_of_active_admin'", after: '# user_choice')
+    end
   end
 end

data/lib/onotole/add_user_gems/edit_menu_questions.rb

@@ -44,11 +44,16 @@ module Onotole
                               active_admin_import:    'The most efficient way to import for ActiveAdmin',
                               active_admin_theme:     'Theme, flat skin',
                               active_skin:            'Theme, flat, nice, good maintenance',
-                              flattened_active_admin: 'Theme. Bring your Active Admin up-to-date with this customizable add on' }
+                              flattened_active_admin: 'Theme, bring your Active Admin up-to-date with this customizable add on',
+                              active_admin_bootstrap: 'Theme, simple bootstrap (sass) elements',
+                              face_of_active_admin:   'Theme for ActiveAdmin with glyphicons and flattens' }
       themes = [:active_admin_theme, :active_skin, :flattened_active_admin]
-      multiple_choice('Select activeadmin plug-ins.', variants).each do |gem|
+      multiple_choice('Select activeadmin plug-ins (Themes are SASS or SCSS only).', variants).each do |gem|
         add_to_user_choise gem
-        AppBuilder.active_admin_theme_selected = true if themes.include? gem
+        if themes.include? gem
+          AppBuilder.use_asset_pipelline = false
+          AppBuilder.active_admin_theme_selected = true
+        end
       end
     end
 

data/lib/onotole/version.rb

@@ -2,5 +2,5 @@
 module Onotole
   RAILS_VERSION = '~> 4.2.0'
   RUBY_VERSION = IO.read("#{File.dirname(__FILE__)}/../../.ruby-version").strip
-  VERSION = '1.1.0'
+  VERSION = '1.1.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onotole
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - kvokka
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-07 00:00:00.000000000 Z
+date: 2016-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler