decidim-generators 0.11.1 → 0.11.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (6) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile.lock +89 -89
  3. data/lib/decidim/generators/app_generator.rb +26 -4
  4. data/lib/decidim/generators/install_generator.rb +14 -2
  5. data/lib/decidim/generators/version.rb +1 -1
  6. metadata +5 -5
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 955378a4f430b77dfc559a040556a804b335c538055a32d450c49b94d526b1cd
4
- data.tar.gz: 65858bef560194ada66dd87b41f2f9b6fc0a98f0f46557bd0e5b718c7574c4c8
3
+ metadata.gz: 4bb4e892f88e5d7fc49ebb04f21cfe1722498342ab8a2797c96d1afc7fb172d3
4
+ data.tar.gz: 96c63919b403cc7cd972384b9878df93677148a32dcccf87477a8b768b8453f6
5
5
  SHA512:
6
- metadata.gz: 881c2fd2f271887128ea718915ee3245efe0b94752565a99aa77b73036014bf42b23b965ab4f9bfe7127ffb97ce7831dc669700b5caba02d57f500880666af24
7
- data.tar.gz: 5b25d15f602d5345901ba88c554bd10d5c764456ed57d8c39d794b446bc20c5a6bbd7ac28cdd36b63c0c611e3ec753911275762fb7eeb46405e24c5668ffc551
6
+ metadata.gz: a4d51e77ceb4b59717af0183817eb01806e5fd1ea73cc5092ccf1075621234bf602c0108ac02a940f2cd975b92a015bbe8b9fdbfcd5167569cc00a091e220ce3
7
+ data.tar.gz: d325e9033ea033c6429f27ecfa3ba5d886d41396cf14d22f07ed00c7f900a6d60a21afc96568ec2b85c3ad15a38ca8d3d7a2ff5d35ec148dda91bc04434cf49e
data/Gemfile.lock CHANGED
@@ -1,61 +1,61 @@
1
1
  PATH
2
2
  remote: ..
3
3
  specs:
4
- decidim (0.11.0.pre1)
5
- decidim-accountability (= 0.11.0.pre1)
6
- decidim-admin (= 0.11.0.pre1)
7
- decidim-api (= 0.11.0.pre1)
8
- decidim-assemblies (= 0.11.0.pre1)
9
- decidim-blogs (= 0.11.0.pre1)
10
- decidim-budgets (= 0.11.0.pre1)
11
- decidim-comments (= 0.11.0.pre1)
12
- decidim-core (= 0.11.0.pre1)
13
- decidim-debates (= 0.11.0.pre1)
14
- decidim-generators (= 0.11.0.pre1)
15
- decidim-meetings (= 0.11.0.pre1)
16
- decidim-pages (= 0.11.0.pre1)
17
- decidim-participatory_processes (= 0.11.0.pre1)
18
- decidim-proposals (= 0.11.0.pre1)
19
- decidim-sortitions (= 0.11.0.pre1)
20
- decidim-surveys (= 0.11.0.pre1)
21
- decidim-system (= 0.11.0.pre1)
22
- decidim-verifications (= 0.11.0.pre1)
23
- decidim-accountability (0.11.0.pre1)
24
- decidim-comments (= 0.11.0.pre1)
25
- decidim-core (= 0.11.0.pre1)
4
+ decidim (0.11.2)
5
+ decidim-accountability (= 0.11.2)
6
+ decidim-admin (= 0.11.2)
7
+ decidim-api (= 0.11.2)
8
+ decidim-assemblies (= 0.11.2)
9
+ decidim-blogs (= 0.11.2)
10
+ decidim-budgets (= 0.11.2)
11
+ decidim-comments (= 0.11.2)
12
+ decidim-core (= 0.11.2)
13
+ decidim-debates (= 0.11.2)
14
+ decidim-generators (= 0.11.2)
15
+ decidim-meetings (= 0.11.2)
16
+ decidim-pages (= 0.11.2)
17
+ decidim-participatory_processes (= 0.11.2)
18
+ decidim-proposals (= 0.11.2)
19
+ decidim-sortitions (= 0.11.2)
20
+ decidim-surveys (= 0.11.2)
21
+ decidim-system (= 0.11.2)
22
+ decidim-verifications (= 0.11.2)
23
+ decidim-accountability (0.11.2)
24
+ decidim-comments (= 0.11.2)
25
+ decidim-core (= 0.11.2)
26
26
  kaminari (~> 1.0)
27
27
  searchlight (~> 4.1)
28
- decidim-admin (0.11.0.pre1)
28
+ decidim-admin (0.11.2)
29
29
  active_link_to (~> 1.0)
30
- decidim-core (= 0.11.0.pre1)
30
+ decidim-core (= 0.11.2)
31
31
  devise (~> 4.2)
32
32
  devise-i18n (~> 1.2)
33
33
  devise_invitable (~> 1.7)
34
34
  jquery-rails (~> 4.3)
35
35
  sassc-rails (~> 1.3)
36
- decidim-api (0.11.0.pre1)
36
+ decidim-api (0.11.2)
37
37
  graphiql-rails (~> 1.4)
38
38
  graphql (~> 1.6)
39
39
  rack-cors (~> 1.0)
40
40
  sprockets-es6 (~> 0.9.2)
41
- decidim-assemblies (0.11.0.pre1)
42
- decidim-core (= 0.11.0.pre1)
43
- decidim-blogs (0.11.0.pre1)
44
- decidim-admin (= 0.11.0.pre1)
45
- decidim-comments (= 0.11.0.pre1)
46
- decidim-core (= 0.11.0.pre1)
41
+ decidim-assemblies (0.11.2)
42
+ decidim-core (= 0.11.2)
43
+ decidim-blogs (0.11.2)
44
+ decidim-admin (= 0.11.2)
45
+ decidim-comments (= 0.11.2)
46
+ decidim-core (= 0.11.2)
47
47
  httparty (~> 0.16.0)
48
48
  jquery-tmpl-rails (~> 1.1)
49
49
  kaminari (~> 1.0)
50
- decidim-budgets (0.11.0.pre1)
51
- decidim-comments (= 0.11.0.pre1)
52
- decidim-core (= 0.11.0.pre1)
50
+ decidim-budgets (0.11.2)
51
+ decidim-comments (= 0.11.2)
52
+ decidim-core (= 0.11.2)
53
53
  kaminari (~> 1.0)
54
54
  searchlight (~> 4.1)
55
- decidim-comments (0.11.0.pre1)
56
- decidim-core (= 0.11.0.pre1)
55
+ decidim-comments (0.11.2)
56
+ decidim-core (= 0.11.2)
57
57
  jquery-rails (~> 4.0)
58
- decidim-core (0.11.0.pre1)
58
+ decidim-core (0.11.2)
59
59
  active_link_to (~> 1.0)
60
60
  autoprefixer-rails (~> 8.0)
61
61
  cancancan (~> 2.0)
@@ -63,7 +63,7 @@ PATH
63
63
  cells-erb (~> 0.1.0)
64
64
  cells-rails (~> 0.0.8)
65
65
  date_validator (~> 0.9.0)
66
- decidim-api (= 0.11.0.pre1)
66
+ decidim-api (= 0.11.2)
67
67
  devise (~> 4.3)
68
68
  devise-i18n (~> 1.2)
69
69
  doorkeeper (~> 4.3)
@@ -96,16 +96,16 @@ PATH
96
96
  uglifier (~> 4.0)
97
97
  valid_email2 (~> 2.1)
98
98
  wisper (~> 2.0)
99
- decidim-debates (0.11.0.pre1)
100
- decidim-comments (= 0.11.0.pre1)
101
- decidim-core (= 0.11.0.pre1)
99
+ decidim-debates (0.11.2)
100
+ decidim-comments (= 0.11.2)
101
+ decidim-core (= 0.11.2)
102
102
  kaminari (~> 1.0)
103
103
  searchlight (~> 4.1)
104
- decidim-dev (0.11.0.pre1)
104
+ decidim-dev (0.11.2)
105
105
  byebug (~> 10.0)
106
106
  capybara (~> 2.15)
107
107
  db-query-matchers (~> 0.9.0)
108
- decidim (= 0.11.0.pre1)
108
+ decidim (= 0.11.2)
109
109
  erb_lint (~> 0.0.22)
110
110
  factory_bot_rails (~> 4.8)
111
111
  i18n-tasks (~> 0.9.18)
@@ -121,45 +121,45 @@ PATH
121
121
  simplecov (~> 0.13)
122
122
  webmock (~> 3.0)
123
123
  wisper-rspec (~> 1.0)
124
- decidim-generators (0.11.0.pre1)
125
- decidim-core (= 0.11.0.pre1)
126
- decidim-meetings (0.11.0.pre1)
124
+ decidim-generators (0.11.2)
125
+ decidim-core (= 0.11.2)
126
+ decidim-meetings (0.11.2)
127
127
  cells-erb (~> 0.1.0)
128
128
  cells-rails (~> 0.0.8)
129
- decidim-core (= 0.11.0.pre1)
129
+ decidim-core (= 0.11.2)
130
130
  httparty (~> 0.16.0)
131
131
  icalendar (~> 2.4)
132
132
  jquery-tmpl-rails (~> 1.1)
133
133
  kaminari (~> 1.0)
134
134
  searchlight (~> 4.1)
135
- decidim-pages (0.11.0.pre1)
136
- decidim-core (= 0.11.0.pre1)
137
- decidim-participatory_processes (0.11.0.pre1)
138
- decidim-core (= 0.11.0.pre1)
139
- decidim-proposals (0.11.0.pre1)
140
- decidim-comments (= 0.11.0.pre1)
141
- decidim-core (= 0.11.0.pre1)
135
+ decidim-pages (0.11.2)
136
+ decidim-core (= 0.11.2)
137
+ decidim-participatory_processes (0.11.2)
138
+ decidim-core (= 0.11.2)
139
+ decidim-proposals (0.11.2)
140
+ decidim-comments (= 0.11.2)
141
+ decidim-core (= 0.11.2)
142
142
  kaminari (~> 1.0)
143
143
  ransack (~> 1.8)
144
144
  social-share-button (~> 1.0)
145
- decidim-sortitions (0.11.0.pre1)
146
- decidim-admin (= 0.11.0.pre1)
147
- decidim-comments (= 0.11.0.pre1)
148
- decidim-core (= 0.11.0.pre1)
149
- decidim-proposals (= 0.11.0.pre1)
145
+ decidim-sortitions (0.11.2)
146
+ decidim-admin (= 0.11.2)
147
+ decidim-comments (= 0.11.2)
148
+ decidim-core (= 0.11.2)
149
+ decidim-proposals (= 0.11.2)
150
150
  social-share-button (~> 1.0)
151
- decidim-surveys (0.11.0.pre1)
152
- decidim-core (= 0.11.0.pre1)
153
- decidim-system (0.11.0.pre1)
151
+ decidim-surveys (0.11.2)
152
+ decidim-core (= 0.11.2)
153
+ decidim-system (0.11.2)
154
154
  active_link_to (~> 1.0)
155
- decidim-core (= 0.11.0.pre1)
155
+ decidim-core (= 0.11.2)
156
156
  devise (~> 4.2)
157
157
  devise-i18n (~> 1.2)
158
158
  devise_invitable (~> 1.7)
159
159
  jquery-rails (~> 4.3)
160
160
  sassc-rails (~> 1.3)
161
- decidim-verifications (0.11.0.pre1)
162
- decidim-core (= 0.11.0.pre1)
161
+ decidim-verifications (0.11.2)
162
+ decidim-core (= 0.11.2)
163
163
 
164
164
  GEM
165
165
  remote: https://rubygems.org/
@@ -208,7 +208,7 @@ GEM
208
208
  public_suffix (>= 2.0.2, < 4.0)
209
209
  arel (8.0.0)
210
210
  ast (2.4.0)
211
- autoprefixer-rails (8.3.0.1)
211
+ autoprefixer-rails (8.6.2)
212
212
  execjs
213
213
  axiom-types (0.1.1)
214
214
  descendants_tracker (~> 0.0.4)
@@ -218,8 +218,8 @@ GEM
218
218
  babel-transpiler (0.7.0)
219
219
  babel-source (>= 4.0, < 6)
220
220
  execjs (~> 2.0)
221
- bcrypt (3.1.11)
222
- better_html (1.0.7)
221
+ bcrypt (3.1.12)
222
+ better_html (1.0.11)
223
223
  actionview (>= 4.0)
224
224
  activesupport (>= 4.0)
225
225
  ast (~> 2.0)
@@ -294,7 +294,7 @@ GEM
294
294
  actionmailer (>= 4.1.0)
295
295
  devise (>= 4.0.0)
296
296
  diff-lcs (1.3)
297
- docile (1.3.0)
297
+ docile (1.3.1)
298
298
  doorkeeper (4.3.2)
299
299
  railties (>= 4.2)
300
300
  doorkeeper-i18n (4.0.0)
@@ -302,7 +302,7 @@ GEM
302
302
  thread
303
303
  thread_safe
304
304
  equalizer (0.0.11)
305
- erb_lint (0.0.24)
305
+ erb_lint (0.0.26)
306
306
  activesupport
307
307
  better_html (~> 1.0.7)
308
308
  colorize
@@ -313,18 +313,18 @@ GEM
313
313
  temple
314
314
  erubi (1.7.1)
315
315
  execjs (2.7.0)
316
- factory_bot (4.8.2)
316
+ factory_bot (4.10.0)
317
317
  activesupport (>= 3.0.0)
318
- factory_bot_rails (4.8.2)
319
- factory_bot (~> 4.8.2)
318
+ factory_bot_rails (4.10.0)
319
+ factory_bot (~> 4.10.0)
320
320
  railties (>= 3.0.0)
321
321
  faker (1.8.7)
322
322
  i18n (>= 0.7)
323
323
  faraday (0.12.2)
324
324
  multipart-post (>= 1.2, < 3)
325
325
  ffi (1.9.23)
326
- file_validators (2.1.0)
327
- activemodel (>= 3.0)
326
+ file_validators (2.3.0)
327
+ activemodel (>= 3.2)
328
328
  mime-types (>= 1.0)
329
329
  foundation-rails (6.4.3.0)
330
330
  railties (>= 3.1.0)
@@ -336,18 +336,18 @@ GEM
336
336
  activesupport (>= 4.1, < 6.0)
337
337
  railties (>= 4.1, < 6.0)
338
338
  tzinfo (~> 1.2, >= 1.2.2)
339
- geocoder (1.4.7)
339
+ geocoder (1.4.9)
340
340
  globalid (0.4.1)
341
341
  activesupport (>= 4.2.0)
342
342
  graphiql-rails (1.4.10)
343
343
  railties
344
344
  sprockets-rails
345
- graphql (1.7.14)
345
+ graphql (1.8.2)
346
346
  hashdiff (0.3.7)
347
347
  hashie (3.5.7)
348
348
  high_voltage (3.0.0)
349
- highline (1.7.10)
350
- html_tokenizer (0.0.6)
349
+ highline (2.0.0)
350
+ html_tokenizer (0.0.7)
351
351
  htmlentities (4.3.4)
352
352
  httparty (0.16.2)
353
353
  multi_xml (>= 0.5.2)
@@ -415,7 +415,7 @@ GEM
415
415
  multi_json (1.13.1)
416
416
  multi_xml (0.6.0)
417
417
  multipart-post (2.0.0)
418
- nio4r (2.3.0)
418
+ nio4r (2.3.1)
419
419
  nokogiri (1.8.2)
420
420
  mini_portile2 (~> 2.3.0)
421
421
  oauth (0.5.4)
@@ -453,7 +453,7 @@ GEM
453
453
  pg (1.0.0)
454
454
  polyamorous (1.3.3)
455
455
  activerecord (>= 3.0)
456
- powerpack (0.1.1)
456
+ powerpack (0.1.2)
457
457
  premailer (1.11.1)
458
458
  addressable
459
459
  css_parser (>= 1.6.0)
@@ -556,7 +556,7 @@ GEM
556
556
  rainbow (>= 2.2.2, < 4.0)
557
557
  ruby-progressbar (~> 1.7)
558
558
  unicode-display_width (~> 1.0, >= 1.0.1)
559
- rubocop-rspec (1.25.1)
559
+ rubocop-rspec (1.26.0)
560
560
  rubocop (>= 0.53.0)
561
561
  ruby-ole (1.2.12.1)
562
562
  ruby-progressbar (1.9.0)
@@ -576,7 +576,7 @@ GEM
576
576
  sprockets-rails
577
577
  tilt
578
578
  searchlight (4.1.0)
579
- selenium-webdriver (3.11.0)
579
+ selenium-webdriver (3.12.0)
580
580
  childprocess (~> 0.5)
581
581
  rubyzip (~> 1.2)
582
582
  simplecov (0.16.1)
@@ -620,7 +620,7 @@ GEM
620
620
  uber (0.1.0)
621
621
  uglifier (4.1.7)
622
622
  execjs (>= 0.3.0, < 3)
623
- unicode-display_width (1.3.2)
623
+ unicode-display_width (1.4.0)
624
624
  valid_email2 (2.2.3)
625
625
  activemodel (>= 3.2)
626
626
  mail (~> 2.5)
@@ -636,7 +636,7 @@ GEM
636
636
  activemodel (>= 5.0)
637
637
  bindex (>= 0.4.0)
638
638
  railties (>= 5.0)
639
- webmock (3.3.0)
639
+ webmock (3.4.2)
640
640
  addressable (>= 2.3.6)
641
641
  crack (>= 0.3.2)
642
642
  hashdiff
@@ -644,8 +644,8 @@ GEM
644
644
  websocket-extensions (>= 0.1.0)
645
645
  websocket-extensions (0.1.3)
646
646
  wisper (2.0.0)
647
- wisper-rspec (1.0.1)
648
- xpath (3.0.0)
647
+ wisper-rspec (1.1.0)
648
+ xpath (3.1.0)
649
649
  nokogiri (~> 1.8)
650
650
 
651
651
  PLATFORMS
@@ -665,7 +665,7 @@ DEPENDENCIES
665
665
  web-console (~> 3.5)
666
666
 
667
667
  RUBY VERSION
668
- ruby 2.5.0p0
668
+ ruby 2.5.1p57
669
669
 
670
670
  BUNDLED WITH
671
- 1.16.1
671
+ 1.16.2
data/lib/decidim/generators/app_generator.rb CHANGED
@@ -25,6 +25,10 @@ module Decidim
25
25
 
26
26
  source_root File.expand_path("app_templates", __dir__)
27
27
 
28
+ class_option :app_name, type: :string,
29
+ default: nil,
30
+ desc: "The name of the app"
31
+
28
32
  class_option :path, type: :string,
29
33
  default: nil,
30
34
  desc: "Path to the gem"
@@ -95,9 +99,18 @@ module Decidim
95
99
  end
96
100
 
97
101
  gsub_file "Gemfile", /gem "#{current_gem}".*/, "gem \"#{current_gem}\", #{gem_modifier}"
98
- gsub_file "Gemfile", /gem "decidim-dev".*/, "gem \"decidim-dev\", #{gem_modifier}" if current_gem == "decidim"
99
- gsub_file "Gemfile", /gem "decidim-([A-z]+)".*/, "# gem \"decidim-\\1\", #{gem_modifier}"
100
- gsub_file "Gemfile", /(# )?gem "decidim-dev".*/, "gem \"decidim-dev\", #{gem_modifier}" if current_gem == "decidim"
102
+
103
+ if current_gem == "decidim"
104
+ gsub_file "Gemfile", /gem "decidim-dev".*/, "gem \"decidim-dev\", #{gem_modifier}"
105
+
106
+ if options[:demo]
107
+ gsub_file "Gemfile", /gem "decidim-consultations".*/, "gem \"decidim-consultations\", #{gem_modifier}"
108
+ gsub_file "Gemfile", /gem "decidim-initiatives".*/, "gem \"decidim-initiatives\", #{gem_modifier}"
109
+ else
110
+ gsub_file "Gemfile", /gem "decidim-consultations".*/, "# gem \"decidim-consultations\", #{gem_modifier}"
111
+ gsub_file "Gemfile", /gem "decidim-initiatives".*/, "# gem \"decidim-initiatives\", #{gem_modifier}"
112
+ end
113
+ end
101
114
 
102
115
  Bundler.with_original_env { run "bundle install" }
103
116
  end
@@ -122,6 +135,7 @@ module Decidim
122
135
  [
123
136
  "--recreate_db=#{options[:recreate_db]}",
124
137
  "--seed_db=#{options[:seed_db]}",
138
+ "--skip_gemfile=#{options[:skip_gemfile]}",
125
139
  "--app_name=#{app_name}"
126
140
  ]
127
141
  )
@@ -129,10 +143,18 @@ module Decidim
129
143
 
130
144
  private
131
145
 
146
+ def app_name
147
+ options[:app_name] || super
148
+ end
149
+
150
+ def app_const_base
151
+ app_name.gsub(/\W/, "_").squeeze("_").camelize
152
+ end
153
+
132
154
  def current_gem
133
155
  return "decidim" unless options[:path]
134
156
 
135
- File.read(gemspec).match(/name\s*=\s*['"](?<name>.*)["']/)[:name]
157
+ @current_gem ||= File.read(gemspec).match(/name\s*=\s*['"](?<name>.*)["']/)[:name]
136
158
  end
137
159
 
138
160
  def gemspec
data/lib/decidim/generators/install_generator.rb CHANGED
@@ -26,6 +26,10 @@ module Decidim
26
26
  default: false,
27
27
  desc: "Seed db after installing decidim"
28
28
 
29
+ class_option :skip_gemfile, type: :boolean,
30
+ default: false,
31
+ desc: "Don't generate a Gemfile for the application"
32
+
29
33
  def install
30
34
  route "mount Decidim::Core::Engine => '/'"
31
35
  end
@@ -146,12 +150,20 @@ module Decidim
146
150
 
147
151
  # Runs rails commands in a subprocess, and aborts if it doesn't suceeed
148
152
  def rails(*args)
149
- abort unless system("bin/rails", *args)
153
+ with_original_env do
154
+ abort unless system("bin/rails", *args)
155
+ end
150
156
  end
151
157
 
152
158
  # Runs rails commands in a subprocess silencing errors, and ignores status
153
159
  def soft_rails(*args)
154
- system("bin/rails", *args, err: File::NULL)
160
+ with_original_env do
161
+ system("bin/rails", *args, err: File::NULL)
162
+ end
163
+ end
164
+
165
+ def with_original_env
166
+ options[:skip_gemfile] ? yield : Bundler.with_original_env { yield }
155
167
  end
156
168
 
157
169
  def scss_variables
data/lib/decidim/generators/version.rb CHANGED
@@ -4,7 +4,7 @@
4
4
  module Decidim
5
5
  module Generators
6
6
  def self.version
7
- "0.11.1"
7
+ "0.11.2"
8
8
  end
9
9
  end
10
10
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: decidim-generators
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.11.1
4
+ version: 0.11.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
10
10
  autorequire:
11
11
  bindir: exe
12
12
  cert_chain: []
13
- date: 2018-05-14 00:00:00.000000000 Z
13
+ date: 2018-06-13 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: decidim-core
@@ -18,14 +18,14 @@ dependencies:
18
18
  requirements:
19
19
  - - '='
20
20
  - !ruby/object:Gem::Version
21
- version: 0.11.1
21
+ version: 0.11.2
22
22
  type: :runtime
23
23
  prerelease: false
24
24
  version_requirements: !ruby/object:Gem::Requirement
25
25
  requirements:
26
26
  - - '='
27
27
  - !ruby/object:Gem::Version
28
- version: 0.11.1
28
+ version: 0.11.2
29
29
  - !ruby/object:Gem::Dependency
30
30
  name: bundler
31
31
  requirement: !ruby/object:Gem::Requirement
@@ -116,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
116
116
  version: '0'
117
117
  requirements: []
118
118
  rubyforge_project:
119
- rubygems_version: 2.7.3
119
+ rubygems_version: 2.7.6
120
120
  signing_key:
121
121
  specification_version: 4
122
122
  summary: Citizen participation framework for Ruby on Rails.